1. 20 Jun, 2006 14 commits
    • unknown's avatar
      field.cc, field.h: · 406a7ba9
      unknown authored
        Additional fix for #16377 for bigendian platforms
      sql_select.cc, select.result, select.test:
        After merge fix
      
      
      mysql-test/t/select.test:
        After merge fix
      mysql-test/r/select.result:
        After merge fix
      sql/sql_select.cc:
        After merge fix
      sql/field.h:
        Additional fix for #16377 for bigendian platforms
      sql/field.cc:
        Additional fix for #16377 for bigendian platforms
      406a7ba9
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5805bba6
      unknown authored
      into moonbone.local:/work/tmp_merge-5.0-opt-mysql
      
      
      5805bba6
    • unknown's avatar
      Manually merged · b6a416ff
      unknown authored
      
      mysql-test/t/select.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      b6a416ff
    • unknown's avatar
      select.result: · 3e7d68b1
      unknown authored
        Added test case for bug#18759 Incorrect string to numeric conversion.  
      select.test:
        Added test case for bug#18759 Incorrect string to numeric conversion.
      item_cmpfunc.cc:
        Cleanup after fix for bug#18360 removal
      
      
      sql/item_cmpfunc.cc:
        Cleanup after fix for bug#18360 removal
      mysql-test/t/select.test:
        Added test case for bug#18759 Incorrect string to numeric conversion.
      mysql-test/r/select.result:
        Added test case for bug#18759 Incorrect string to numeric conversion.
      3e7d68b1
    • unknown's avatar
      Manually merged · 4d3803f0
      unknown authored
      
      mysql-test/r/insert_select.result:
        Auto merged
      mysql-test/t/insert_select.test:
        Auto merged
      4d3803f0
    • unknown's avatar
      Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.0 · 783866ff
      unknown authored
      into  mysql.com:/home/emurphy/mysql-5.0-heikki
      
      
      783866ff
    • unknown's avatar
      Applying patch from SergeyV · b2507220
      unknown authored
      Fixes bug#17264, for alter table on win32 for successfull operation completion
      it is used TL_WRITE(=10) lock instead of TL_WRITE_ALLOW_READ(=6), however here
      in innodb handler TL_WRTIE is lifted to TL_WRITE_ALLOW_WRITE, which causes
      race condition when several clients do alter table simultaneously.
      
      
      mysql-test/r/lock_multi.result:
        Test case for bug#17264.
      mysql-test/t/lock_multi.test:
        Test case for bug#17264
      b2507220
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9ef50ebe
      unknown authored
      into  mysql.com:/mnt/storeage/mysql-5.0
      
      
      9ef50ebe
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 70a087e5
      unknown authored
      into sunlight.local:/home/evgen/tmp_merge-5.0-opt-mysql
      
      
      70a087e5
    • unknown's avatar
      item_cmpfunc.cc: · 739248f9
      unknown authored
        After merge fix
      
      
      sql/item_cmpfunc.cc:
        After merge fix
      739248f9
    • unknown's avatar
      func_time.result: · ac2c480f
      unknown authored
        After merge fix
      
      
      mysql-test/r/func_time.result:
        After merge fix
      ac2c480f
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main · 0f6a24ad
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge
      
      
      ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      0f6a24ad
    • unknown's avatar
      BUG#20333 valgrind: mgmd event reporting dep on uninit value · 773e91d5
      unknown authored
      
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        user correct pointer
      773e91d5
    • unknown's avatar
      Bug#19407 Test 'func_regexp' fails on Windows x64 · c21f2373
      unknown authored
      
      regex/regexec.c:
        The Win64 pre-processor evaluates state1 at the end of the chain at replace-time not at definition-time.  This causes states1 to be defined as char *.
      c21f2373
  2. 19 Jun, 2006 22 commits
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge · 375a1894
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
      
      
      375a1894
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · 4aa5270d
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      4aa5270d
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-opt · 846c46ea
      unknown authored
      into moonbone.local:/work/tmp_merge-4.1-opt-mysql
      
      
      846c46ea
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 495c6b13
      unknown authored
      into moonbone.local:/work/tmp_merge-4.1-opt-mysql
      
      
      495c6b13
    • unknown's avatar
      Merge · 0c4182bc
      unknown authored
      
      mysql-test/t/func_in.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      mysql-test/r/func_in.result:
        SCCS merged
      0c4182bc
    • unknown's avatar
      item_cmpfunc.cc, func_in.result, func_in.test: · 028fa1e4
      unknown authored
        Reverted fix for bug#18360
      
      
      mysql-test/t/func_in.test:
        Reverted fix for bug#18360
      mysql-test/r/func_in.result:
        Reverted fix for bug#18360
      sql/item_cmpfunc.cc:
        Reverted fix for bug#18360
      028fa1e4
    • unknown's avatar
      Merge mysql.com:/home/alik/MySQL/devel/5.0-rt · 3435f614
      unknown authored
      into  mysql.com:/home/alik/MySQL/devel/5.0-tree-merged
      
      
      3435f614
    • unknown's avatar
      Merge mysql.com:/home/alik/MySQL/devel/5.0-tree · 74cabf4e
      unknown authored
      into  mysql.com:/home/alik/MySQL/devel/5.0-rt
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      74cabf4e
    • unknown's avatar
      Addition to fix for · 3ec84b1a
      unknown authored
      BUG#18036 - update of table joined to self reports table as crashed
      
      Set exclude_from_table_unique_test value back to FALSE. It is needed for
      further check in multi_update::prepare whether to use record cache.
      
      
      sql/sql_update.cc:
        Set exclude_from_table_unique_test value back to FALSE. It is needed for
        further check in multi_update::prepare whether to use record cache.
      3ec84b1a
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · 151fe0cf
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
      
      
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      151fe0cf
    • unknown's avatar
      BUG#17201 Changed to other database (BUG#20531 hinders usage of 'test' database) · d0c58cd8
      unknown authored
      
      mysql-test/r/mysqldump.result:
        Changed to other database (BUG#20531 hinders usage of 'test' database)
      mysql-test/t/mysqldump.test:
        Changed to other database (BUG#20531 hinders usage of 'test' database)
      d0c58cd8
    • unknown's avatar
      Merge april:devel/BitKeeper/mysql-5.0-engines · eeb29b5f
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
      
      
      include/my_global.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      eeb29b5f
    • unknown's avatar
      Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1 · e2097100
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
      
      
      mysql-test/r/myisam.result:
        Manual merge.
      mysql-test/t/myisam.test:
        Manual merge.
      sql/sql_update.cc:
        Manual merge.
      e2097100
    • unknown's avatar
      Merge mysql.com:/home/kgeorge/mysql/4.1/teamclean · 6cf425b8
      unknown authored
      into  mysql.com:/home/kgeorge/mysql/4.1/B9676
      
      
      6cf425b8
    • unknown's avatar
      * Bug #9676: INSERT INTO x SELECT .. FROM x LIMIT 1; slows down with big · 124cb126
      unknown authored
                    tables
      Currently in INSERT ... SELECT ... LIMIT ... the compiler uses a 
      temporary table to store the results of SELECT ... LIMIT .. and then
      uses that table as a source for INSERT. The problem is that in some cases
      it actually skips the LIMIT clause in doing that and materializes the 
      whole SELECT result set regardless of the LIMIT.
      This fix is limiting the process of filling up the temp table with only 
      that much rows that will be actually used by propagating the LIMIT value.
      
      
      mysql-test/r/insert_select.result:
        * Bug #9676: INSERT INTO x SELECT .. FROM x LIMIT 1; slows down with big
                      tables
        - a test demonstrating the code path
      mysql-test/t/insert_select.test:
        * Bug #9676: INSERT INTO x SELECT .. FROM x LIMIT 1; slows down with big
                      tables
        - a test demonstrating the code path
      sql/sql_select.cc:
        * Bug #9676: INSERT INTO x SELECT .. FROM x LIMIT 1; slows down with big
                      tables
        - pass through the real LIMIT number if the temp table is created for
          buffering results.
        - set the counter for all the cases when the temp table is not used for
          grouping
      124cb126
    • unknown's avatar
      The second fix for BUG#19391: IM fails to start after two executions. · 645e3135
      unknown authored
      
      server-tools/instance-manager/guardian.cc:
        Removed erroneous unlock() in Guardian_thread::init():
        instance_map is unlocked in the caller.
      server-tools/instance-manager/instance_map.cc:
        Added TODO comment.
      server-tools/instance-manager/manager.cc:
        Make initialization of alarm infrustructure before starting Guardian
        thread, because Guardian uses thr_alarm().
      645e3135
    • unknown's avatar
      Small fix for test suite: · 799c5935
      unknown authored
        - fix for IM stopping routine;
        - polishing.
      
      
      mysql-test/lib/mtr_process.pl:
        Polishing: make mtr_kill_process() more verbose in debug mode.
      mysql-test/mysql-test-run.pl:
        1. Fix stopping of IM running as a daemon -- after death of the main IM
        process, we should wait for the IM angel to die.
        2. Polishing -- be more verbose in debug mode.
      799c5935
    • unknown's avatar
      Fix of test suite in scope of fixing BUG#18023: IM: instance · 0ff8d486
      unknown authored
      can be started several times; monitor interval must be > 2sec
      
      
      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_utils.result:
        Updated result file.
      mysql-test/t/im_daemon_life_cycle-im.opt:
        Set monitoring interval to 1 second in order to:
          - be consistent with 5.1;
          - speed up tests;
      mysql-test/t/im_daemon_life_cycle.imtest:
        1. Use wait_for_start.sh script to minimize chance of race condition.
        2. Polishing.
      mysql-test/t/im_life_cycle.imtest:
        1. Use wait_for_start.sh and wait_for_stop.sh scripts to
           minimize chance of race condition;
        2. Remove some statements, because there is no way now to
           stabilize their output.
        3. Polishing;
      mysql-test/t/im_utils.imtest:
        1. Use wait_for_start.sh script to minimize chance of race condition.
        2. Polishing.
      mysql-test/t/kill_n_check.sh:
        1. Make timeout configurable by command-line argument;
        2. Change algorithm of waiting for process to restart to be
           more robust.
      mysql-test/t/im_life_cycle-im.opt:
        Set monitoring interval to 1 second in order to:
          - be consistent with 5.1;
          - speed up tests;
      mysql-test/t/im_utils-im.opt:
        Set monitoring interval to 1 second in order to:
          - be consistent with 5.1;
          - speed up tests;
      mysql-test/t/wait_for_process.sh:
        A new helper script, intended to be used instead of dummy "sleep"
        when waiting for some process to start or stop.
      0ff8d486
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · 4c919abf
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      4c919abf
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl · e61fcf7c
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
      
      
      e61fcf7c
    • unknown's avatar
      Merge april:devel/BitKeeper/mysql-4.1 · 5375bcad
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1
      
      
      5375bcad
    • unknown's avatar
      BUG#18036 - update of table joined to self reports table as crashed · 46cdd39e
      unknown authored
      Certain updates of table joined to self results in unexpected
      behavior.
      
      The problem was that record cache was mistakenly enabled for
      self-joined table updates. Normally record cache must be disabled
      for such updates.
      
      Fixed wrong condition in code that determines whether to use
      record cache for self-joined table updates.
      
      Only MyISAM tables were affected.
      
      
      mysql-test/r/myisam.result:
        Test case for BUG#18036.
      mysql-test/t/myisam.test:
        Test case for BUG#18036.
      sql/sql_update.cc:
        Fixed wrong condition in code that determines whether to use
        record cache for self-joined table updates.
      46cdd39e
  3. 18 Jun, 2006 3 commits
  4. 17 Jun, 2006 1 commit