1. 01 Sep, 2006 4 commits
    • unknown's avatar
    • unknown's avatar
      Modification for win subdirectory · 6e9cffa2
      unknown authored
      
      configure.in:
        added win subdir
      6e9cffa2
    • unknown's avatar
      Fixes for crashes and test failures · 5d3e6c27
      unknown authored
      
      scripts/make_win_bin_dist:
        BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/scripts/make_win_bin_dist
      client/mysqlbinlog.cc:
        Fix for cmake build: Cmake doesn't use the VC++ files
      extra/comp_err.c:
        fixed windows crash (debug): We can't call DBUG_RETURN after my_end.
      include/my_dbug.h:
        added missing empty define for DBUG_LEAVE to prevent precompiler errors when
        compiling in non_debug mode
      mysql-test/mysql-test-run.pl:
        Added support for new cmake release and debug paths.
      mysql-test/t/system_mysql_db_fix.test:
        This test requires unix shell script mysql_fix_previleges_tables -> skip under windows
      mysys/my_seek.c:
        Fix for windows debug crash. However this solution is bad: we should never
        call lseek with an invalid file pointer.
      sql/ha_archive.cc:
        Fixed windows crash: We need dup in gzdopen to keep the filehandle open,
        otherwise subsequent calls to mysql_close will fail/crash.
      5d3e6c27
    • unknown's avatar
      make dist changes for Cmake build · cce4cc25
      unknown authored
      
      libmysql/mytest.c:
        Rename: BitKeeper/deleted/.del-mytest.c -> libmysql/mytest.c
      sql/message.mc:
        BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/sql/message.mc
      cce4cc25
  2. 31 Aug, 2006 4 commits
    • unknown's avatar
      Additional files for cmake support · 8f447728
      unknown authored
      
      CMakeLists.txt:
        New BitKeeper file ``CMakeLists.txt''
      bdb/CMakeLists.txt:
        New BitKeeper file ``bdb/CMakeLists.txt''
      client/CMakeLists.txt:
        New BitKeeper file ``client/CMakeLists.txt''
      dbug/CMakeLists.txt:
        New BitKeeper file ``dbug/CMakeLists.txt''
      extra/CMakeLists.txt:
        New BitKeeper file ``extra/CMakeLists.txt''
      extra/yassl/CMakeLists.txt:
        New BitKeeper file ``extra/yassl/CMakeLists.txt''
      extra/yassl/taocrypt/CMakeLists.txt:
        New BitKeeper file ``extra/yassl/taocrypt/CMakeLists.txt''
      heap/CMakeLists.txt:
        New BitKeeper file ``heap/CMakeLists.txt''
      innobase/CMakeLists.txt:
        New BitKeeper file ``innobase/CMakeLists.txt''
      libmysql/CMakeLists.txt:
        New BitKeeper file ``libmysql/CMakeLists.txt''
      myisam/CMakeLists.txt:
        New BitKeeper file ``myisam/CMakeLists.txt''
      myisammrg/CMakeLists.txt:
        New BitKeeper file ``myisammrg/CMakeLists.txt''
      mysys/CMakeLists.txt:
        New BitKeeper file ``mysys/CMakeLists.txt''
      regex/CMakeLists.txt:
        New BitKeeper file ``regex/CMakeLists.txt''
      server-tools/CMakeLists.txt:
        New BitKeeper file ``server-tools/CMakeLists.txt''
      server-tools/instance-manager/CMakeLists.txt:
        New BitKeeper file ``server-tools/instance-manager/CMakeLists.txt''
      sql/CMakeLists.txt:
        New BitKeeper file ``sql/CMakeLists.txt''
      sql/examples/CMakeLists.txt:
        New BitKeeper file ``sql/examples/CMakeLists.txt''
      strings/CMakeLists.txt:
        New BitKeeper file ``strings/CMakeLists.txt''
      tests/CMakeLists.txt:
        New BitKeeper file ``tests/CMakeLists.txt''
      vio/CMakeLists.txt:
        New BitKeeper file ``vio/CMakeLists.txt''
      win/Makefile.am:
        New BitKeeper file ``win/Makefile.am''
      win/README:
        New BitKeeper file ``win/README''
      win/build-vs71.bat:
        New BitKeeper file ``win/build-vs71.bat''
      win/build-vs8.bat:
        New BitKeeper file ``win/build-vs8.bat''
      win/build-vs8_x64.bat:
        New BitKeeper file ``win/build-vs8_x64.bat''
      win/configure.js:
        New BitKeeper file ``win/configure.js''
      zlib/CMakeLists.txt:
        New BitKeeper file ``zlib/CMakeLists.txt''
      8f447728
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 · 085446b8
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      configure.in:
        Auto merged
      include/mysql.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      085446b8
    • unknown's avatar
      Disable testing of "encrypt" in ctype_ucs.test · 066154d2
      unknown authored
      
      mysql-test/r/ctype_ucs.result:
        Update result file
      mysql-test/t/ctype_ucs.test:
        Disable testing of "encrypt" function in this file. That test has to be guarded by "have_crypt.inc"
      066154d2
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 1a22b9c1
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-14897
      
      
      configure.in:
        Auto merged
      include/mysql_com.h:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      1a22b9c1
  3. 30 Aug, 2006 12 commits
  4. 29 Aug, 2006 11 commits
    • unknown's avatar
      Post-merge fixes. · 8f0b5afa
      unknown authored
      
      mysql-test/r/view.result:
        A post-merge fix.
      mysql-test/t/grant.test:
        A post-merge fix.
      mysql-test/t/view.test:
        A post-merge fix.
      8f0b5afa
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 907fd86f
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      907fd86f
    • unknown's avatar
      Remove the fix for Bug#10668 "CREATE USER does not enforce username · 3e0fcd91
      unknown authored
      length limit", it's superseded by the fix for Bug#16899 "Possible buffer
      overflow in handling of DEFINER-clause". Update test results.
      
      
      mysql-test/r/grant.result:
        A post-merge fix.
      mysql-test/t/grant.test:
        A new error is returned, use the default database after drop database.
      sql/sql_acl.cc:
        Remove an unneeded check.
      3e0fcd91
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8ea5f31a
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-14897
      
      
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/im_life_cycle.result:
        Auto merged
      mysql-test/t/im_life_cycle.imtest:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      mysql-test/r/grant.result:
        Manual merge.
      mysql-test/r/view.result:
        Manual merge.
      mysql-test/t/grant.test:
        Manual merge.
      mysql-test/t/view.test:
        Manual merge.
      8ea5f31a
    • unknown's avatar
      A fix for Bug#14897 "ResultSet.getString("table.column") sometimes · 4355ea5a
      unknown authored
      doesn't find the column"
      
      When a user was using 4.1 tables with VARCHAR column and 5.0 server
      and a query that used a temporary table to resolve itself, the
      table metadata for the varchar column sent to client was incorrect:
      MYSQL_FIELD::table member was empty.
      
      The bug was caused by implicit "upgrade" from old VARCHAR to new
      VARCHAR hard-coded in Field::new_field, which did not preserve
      the information about the original table. Thus, the field metadata
      of the "upgraded" field pointed to an auxiliary temporary table
      created for query execution.
      
      The fix is to copy the pointer to the original table to the new field.
      
      
      mysql-test/r/type_varchar.result:
        Update test results (Bug#14897)
      mysql-test/t/type_varchar.test:
        Add a test case for Bug#14897 "ResultSet.getString("table.column") 
        sometimes doesn't find the column"
      sql/field.cc:
        Preserve the original table name when converting fields from 
        old VARCHAR to new VARCHAR.
      mysql-test/std_data/14897.frm:
        New BitKeeper file ``mysql-test/std_data/14897.frm''
      4355ea5a
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 3f496439
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
      
      
      3f496439
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · a10a5cb6
      unknown authored
      into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
      
      
      a10a5cb6
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 · c923270f
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17591
      
      
      c923270f
    • unknown's avatar
      Preliminary patch for the following bugs: · 33294b1b
      unknown authored
        - BUG#15934: Instance manager fails to work;
        - BUG#18020: IM connect problem;
        - BUG#18027: IM: Server_ID differs;
        - BUG#18033: IM: Server_ID not reported;
        - BUG#21331: Instance Manager: Connect problems in tests;
      
      The only test suite has been changed
      (server codebase has not been modified).
      
      
      BitKeeper/deleted/.del-im_check_os.inc:
        Rename: mysql-test/include/im_check_os.inc -> BitKeeper/deleted/.del-im_check_os.inc
      mysql-test/include/im_check_env.inc:
        Include only this file from all IM-tests.
      mysql-test/lib/mtr_io.pl:
        Update mtr_get_pid_from_file() to workaround race,
        described in BUG#21884.
      mysql-test/lib/mtr_process.pl:
        Refactor im_start()/im_stop() so that they will be more
        reliable. There are the following user-visible changes:
          - if one of these functions fails, the test suite
            is aborted;
          - mtr_im_stop() now determines whether the component is
            alive or not not only by checking PID, but also by trying
            to connect to the component;
          - after starting IM, the test suite waits for it to start
            accepting client connections and to start all its guarded
            mysqld instances;
          - a lot of debug-logs have been added in order to simplify
            investigation of future failures.
      mysql-test/mysql-test-run.pl:
        1. Get rid of kill_and_cleanup();
        2. Move im_start()/im_stop() to mtr_process.pl;
        3. Change default IM port to 9311 so that it does not interfere
           with default slave port;
      mysql-test/r/im_daemon_life_cycle.result:
        Updated result file.
      mysql-test/r/im_life_cycle.result:
        Updated result file.
      mysql-test/r/im_options_set.result:
        Updated result file.
      mysql-test/r/im_options_unset.result:
        Updated result file.
      mysql-test/r/im_utils.result:
        Updated result file.
      mysql-test/t/im_daemon_life_cycle.imtest:
        Updated IM-test.
      mysql-test/t/im_life_cycle.imtest:
        Updated IM-test.
      mysql-test/t/im_options_set.imtest:
        Updated IM-test.
      mysql-test/t/im_options_unset.imtest:
        Updated IM-test.
      mysql-test/t/im_utils.imtest:
        Updated IM-test.
      33294b1b
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 · b2d1f7a4
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17591
      
      
      mysql-test/r/view.result:
        Manual merge.
      mysql-test/t/view.test:
        Manual merge.
      b2d1f7a4
    • unknown's avatar
      BUG#17591: Updatable view not possible with trigger or stored function · 7a5a2544
      unknown authored
      When a view was used inside a trigger or a function, lock type for
      tables used in a view was always set to READ (thus making the view
      non-updatable), even if we were trying to update the view.
      
      The solution is to set lock type properly.
      
      
      mysql-test/r/view.result:
        Add result for bug#17591: Updatable view not possible with trigger
        or stored function.
      mysql-test/t/view.test:
        Add test case for bug#17591: Updatable view not possible with trigger
        or stored function.
      sql/sql_view.cc:
        Move the code that sets requested lock type before the point where
        we exit from mysql_make_view() when we process a placeholder for
        prelocked table.
      7a5a2544
  5. 28 Aug, 2006 4 commits
  6. 26 Aug, 2006 4 commits
  7. 25 Aug, 2006 1 commit