1. 21 Jun, 2006 2 commits
  2. 19 Jun, 2006 16 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 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
      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 11 commits
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6bd6c469
      unknown authored
      into  clam.ndb.mysql.com:/space/pekka/ndb/version/my50
      
      
      6bd6c469
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new · 81202460
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
      
      
      ndb/Makefile.am:
        Auto merged
      81202460
    • unknown's avatar
      Makefile.am: · 4d366600
      unknown authored
        Avoid error message trying 'windoze-dsp' in obsolete directory
      compile-dist:
        Avoid error message for target 'distclean' and no Makefile
      
      
      BUILD/compile-dist:
        Avoid error message for target 'distclean' and no Makefile
      ndb/Makefile.am:
        Avoid error message trying 'windoze-dsp' in obsolete directory
      4d366600
    • unknown's avatar
      Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50 · 4c9815a9
      unknown authored
      into  clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285
      
      
      4c9815a9
    • unknown's avatar
      ndb - bug#19285 minor fixes · 76d2ecea
      unknown authored
      
      ndb/src/ndbapi/NdbBlob.cpp:
        bug#19285 minor fixes
      ndb/src/ndbapi/ndberror.c:
        bug#19285 minor fixes
      76d2ecea
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new · 7775e0a1
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
      
      
      scripts/make_win_src_distribution.sh:
        Auto merged
      7775e0a1
    • unknown's avatar
      make_win_src_distribution.sh: · d1e21c2c
      unknown authored
        Make output less verbose
        Make temporary directory name unique
        Remove temporary directory on interrupt
      
      
      scripts/make_win_src_distribution.sh:
        Make output less verbose
        Make temporary directory name unique
        Remove temporary directory on interrupt
      d1e21c2c
    • unknown's avatar
      make_win_src_distribution.sh: · 2aa2db7a
      unknown authored
        Don't try copy non existing extra/{sql_state,mysqld_error}.h
      
      
      scripts/make_win_src_distribution.sh:
        Don't try copy non existing extra/{sql_state,mysqld_error}.h
      2aa2db7a
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new · dc340f82
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
      
      
      scripts/make_win_src_distribution.sh:
        Auto merged
      dc340f82
    • unknown's avatar
      make_win_src_distribution.sh: · 4a4a82a4
      unknown authored
        Include "sql_yacc.yy" for completeness (bug#20387)
      
      
      scripts/make_win_src_distribution.sh:
        Include "sql_yacc.yy" for completeness (bug#20387)
        Improved error handling
        Don't list all files packed with tar/zip unless debugging
      4a4a82a4
    • unknown's avatar
      Merge · b1b5dbb0
      unknown authored
      
      BitKeeper/deleted/.del-mysql_install.def~8da659e7c0f7e571:
        Auto merged
      b1b5dbb0
  5. 16 Jun, 2006 8 commits
    • unknown's avatar
      Merge moonbone.local:/work/tmp_merge-5.0 · 9ec3f63f
      unknown authored
      into moonbone.local:/work/tmp_merge-5.0-opt-mysql
      
      
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/archive.result:
        Auto merged
      mysql-test/r/auto_increment.result:
        Auto merged
      mysql-test/r/ndb_lock.result:
        Auto merged
      mysql-test/r/rpl_log.result:
        Auto merged
      mysql-test/t/archive.test:
        Auto merged
      mysql-test/t/auto_increment.test:
        Auto merged
      mysql-test/t/ndb_lock.test:
        Auto merged
      mysql-test/t/rpl_log.test:
        Auto merged
      sql/ha_archive.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      9ec3f63f
    • unknown's avatar
      Manually merged · 9d3ddf38
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/archive.result:
        Auto merged
      mysql-test/r/auto_increment.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/ndb_lock.result:
        Auto merged
      mysql-test/r/rpl_log.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/archive.test:
        Auto merged
      mysql-test/t/auto_increment.test:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/ndb_lock.test:
        Auto merged
      mysql-test/t/rpl_log.test:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      9d3ddf38
    • unknown's avatar
      select.result: · 60d55cc5
      unknown authored
        After merge fix
      
      
      mysql-test/r/select.result:
        After merge fix
      60d55cc5
    • unknown's avatar
      configure.in, net_serv.cc, compile-netware-END: · 91fb8310
      unknown authored
        Changes for Netware
      
      
      sql/net_serv.cc:
        Netware needs <sys/select.h>
      configure.in:
        Call of "comp_err" has moved, changed code for Netware that
        edits make files to reflect this
      netware/BUILD/compile-netware-END:
        After correcting "configure.in" to edit make files correctly,
        removed obsolete "sed" of "extra/Makefile.am" for Netware
      91fb8310
    • unknown's avatar
      Manually merged · d0f39b6a
      unknown authored
      
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      d0f39b6a
    • unknown's avatar
      Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt · 707de39a
      unknown authored
      into moonbone.local:/work/tmp_merge-5.0-opt-mysql
      
      
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/t/func_str.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      707de39a
    • unknown's avatar
      Manually merged · de292d67
      unknown authored
      
      configure.in:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      de292d67
    • unknown's avatar
      .del-mysql_install.def~8da659e7c0f7e571: · e2d3943c
      unknown authored
        Delete: netware/mysql_install.def
      Makefile.am:
        Removed obsolete "mysql_install.def"
      
      
      netware/Makefile.am:
        Removed obsolete "mysql_install.def"
      BitKeeper/deleted/.del-mysql_install.def~8da659e7c0f7e571:
        Delete: netware/mysql_install.def
      e2d3943c