1. 21 Jun, 2006 1 commit
    • unknown's avatar
      after merge fixes · 1c0ccad9
      unknown authored
      
      mysql-test/r/partition_error.result:
        result fix
      sql/log.cc:
        use open_slow_log() instead of open_query_log() for slow query log
      sql/log.h:
        after merge fix
      sql/set_var.cc:
        after merge fix
        use open_slow_log() instead of open_query_log() for slow query log
      1c0ccad9
  2. 20 Jun, 2006 8 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · aba97a98
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
      
      
      sql/mysqld.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      aba97a98
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 12860658
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
      
      
      sql/mysqld.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      12860658
    • unknown's avatar
      Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0 · 40587958
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
      
      
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/t/myisam.test:
        Manual merge.
      40587958
    • unknown's avatar
      make_win_src_distribution.sh: · 2d097b07
      unknown authored
        Removed reference to missing "tools" directory
      mysql.spec.sh:
        Changed flag --with-yassl => --with-ssl
        Reverted accidental removal of the "make" call :-)
        Configure --with-embedded-server
        Corrected path to "libtool" command
        Corrected path to "libmysqld.a"
        Removed references to "safe_mysqld"
      
      
      support-files/mysql.spec.sh:
        Changed flag --with-yassl => --with-ssl
        Reverted accidental removal of the "make" call :-)
        Configure --with-embedded-server
        Corrected path to "libtool" command
        Corrected path to "libmysqld.a"
        Removed references to "safe_mysqld"
      scripts/make_win_src_distribution.sh:
        Removed reference to missing "tools" directory
      2d097b07
    • unknown's avatar
      Merge · 2a886f5f
      unknown authored
      
      sql/item_func.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      storage/ndb/Makefile.am:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      BUILD/compile-dist:
        SCCS merged
      netware/Makefile.am:
        SCCS merged
      netware/BUILD/compile-netware-END:
        SCCS merged
      2a886f5f
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge · efec50a4
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
      
      
      storage/ndb/include/util/ConfigValues.hpp:
        Auto merged
      storage/ndb/src/common/util/ConfigValues.cpp:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
        manual merge (n/a in 5.1)
      efec50a4
    • unknown's avatar
      BUG#20333 valgrind: mgmd event reporting dep on uninit value · e989cdd4
      unknown authored
      
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        user correct pointer
      e989cdd4
    • unknown's avatar
      fix test result after BUG#20073 fix · 8d9e0c16
      unknown authored
      
      mysql-test/r/ndb_dd_dump.result:
        fix test result
      8d9e0c16
  3. 19 Jun, 2006 26 commits
    • unknown's avatar
      Merge mysql.com:/home/alik/MySQL/devel/5.1-tree · 25994794
      unknown authored
      into  mysql.com:/home/alik/MySQL/devel/5.1-rt
      
      25994794
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · ab0dc71d
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.1
      
      ab0dc71d
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 6d03068c
      unknown authored
      into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
      
      6d03068c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 43144e99
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.1
      
      43144e99
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 · ddb0a7db
      unknown authored
      into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
      
      ddb0a7db
    • unknown's avatar
      rpl_row_log.result, rpl_row_log_innodb.result: · 9ef63c79
      unknown authored
        Fixed failing test case
      
      
      mysql-test/r/rpl_row_log_innodb.result:
        Fixed failing test case
      mysql-test/r/rpl_row_log.result:
        Fixed failing test case
      9ef63c79
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 1e9daff9
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
      
      
      mysql-test/r/join.result:
        Auto merged
      mysql-test/t/join.test:
        Auto merged
      sql/log.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      1e9daff9
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 · fea3da48
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
      
      fea3da48
    • unknown's avatar
      Merge april:devel/BitKeeper/mysql-5.0-engines · a09288b1
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
      
      
      include/my_global.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      a09288b1
    • unknown's avatar
      Merge april:devel/BitKeeper/mysql-5.1-engines · dc54cbc1
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
      
      
      sql/sql_show.cc:
        Auto merged
      dc54cbc1
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt · 92f8d2eb
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.1-kt
      
      92f8d2eb
    • unknown's avatar
      BUG#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS, · 1d970e32
      unknown authored
      
      sql/ha_ndbcluster.cc:
        fix total extents display for FILES table.
        fix extra field to also contain UNDO_BUFFER_SIZE
      1d970e32
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-5.1-new.b18396 · fe44430a
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.1-kt
      
      
      sql/sql_lex.cc:
        Auto merged
      fe44430a
    • unknown's avatar
      after merge fix · 46fbe074
      unknown authored
      
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/share/errmsg.txt:
        manual merge
      46fbe074
    • unknown's avatar
      WL#3015: Logging Improvements - No Restarts(ver N4) · 65b5d848
      unknown authored
      Added slow_query_log & general_log global upadatable variables.
      Added slow-query-log & general-log startup options.
      Added log_output, general_log_file, slow_query_log_file global updatable variables.
      
      
      mysql-test/r/show_check.result:
        WL#3015: Logging Improvements - No Restarts
        result fix
      sql/log.cc:
        WL#3015: Logging Improvements - No Restarts
        added methods to LOGGER class
        void deactivate_log_handlers(THD* thd, uint log_type);
        bool activate_log_handlers(THD* thd, uint log_type);
        added methods to Log_to_file_event_handler:
        TABLE_LIST *get_mysql_slow_log()
        TABLE_LIST *get_mysql_log()
      sql/log.h:
        WL#3015: Logging Improvements - No Restarts
        added methods to LOGGER class
        void deactivate_log_handlers(THD* thd, uint log_type);
        bool activate_log_handlers(THD* thd, uint log_type);
        added methods to Log_to_file_event_handler:
        TABLE_LIST *get_mysql_slow_log()
        TABLE_LIST *get_mysql_log()
      sql/mysql_priv.h:
        WL#3015: Logging Improvements - No Restarts
      sql/mysqld.cc:
        WL#3015: Logging Improvements - No Restarts
        added 'slow-query-log' & 'general-log' options
      sql/set_var.cc:
        WL#3015: Logging Improvements - No Restarts
        added 'slow_query_log' & 'general_log' updatable variables
        added 'log_output', 'general_log_file', 'slow_query_log_file' updatable variables
      sql/set_var.h:
        WL#3015: Logging Improvements - No Restarts
        new class sys_var_log_state
        new class sys_var_log_output
      sql/share/errmsg.txt:
        WL#3015: Logging Improvements - No Restarts
        added error message
      sql/sql_delete.cc:
        WL#3015: Logging Improvements - No Restarts
        'truncate table slow_log|general', keep status of logs
      65b5d848
    • unknown's avatar
      Addition to fix for · d315668b
      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.
      d315668b
    • unknown's avatar
      Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 · d818a053
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.1
      
      
      mysql-test/r/ctype_sjis.result:
        Auto merged
      mysql-test/r/fulltext_left_join.result:
        Auto merged
      mysql-test/t/ctype_sjis.test:
        Auto merged
      mysql-test/t/fulltext_left_join.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      d818a053
    • unknown's avatar
    • unknown's avatar
      Merge april:devel/BitKeeper/mysql-5.0-engines · dbb50947
      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
      dbb50947
    • unknown's avatar
      Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1 · 774aad61
      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.
      774aad61
    • unknown's avatar
      WL#3298: IM: make command-line option names consistent · f118cb49
      unknown authored
      1. Removed '-P' command line option;
      2. Renamed '--passwd' command line option to '--print-password-line'.
      
      
      mysql-test/t/im_cmd_line.imtest:
        Renamed "--passwd" to "--print-password-line".
      server-tools/instance-manager/options.cc:
        1. Removed '-P' option;
        2. Renamed '--passwd' to '--print-password-line'.
      server-tools/instance-manager/user_management_commands.cc:
        Renamed class Passwd_cmd to Print_password_line_cmd.
      server-tools/instance-manager/user_management_commands.h:
        Renamed class Passwd_cmd to Print_password_line_cmd.
      f118cb49
    • unknown's avatar
    • unknown's avatar
      Merge april:devel/BitKeeper/mysql-4.1 · 71cb9b68
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1
      
      71cb9b68
    • unknown's avatar
      BUG#18036 - update of table joined to self reports table as crashed · b424c584
      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.
      b424c584
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-5.1-new.b18201 · 009127a8
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.1-kt
      
      
      mysql-test/r/xml.result:
        Auto merged
      mysql-test/t/xml.test:
        Auto merged
      sql/item_xmlfunc.cc:
        Auto merged
      009127a8
    • unknown's avatar
      rpl_log.test, rpl_stm_log.result: · 6f5c5c3c
      unknown authored
        Fixed failing test case
      field.cc, item_cmpfunc.cc, select.result:
        After merge fix
      
      
      mysql-test/r/select.result:
        After merge fix
      mysql-test/r/rpl_stm_log.result:
        Fixed failing test case
      sql/item_cmpfunc.cc:
        After merge fix
      sql/field.cc:
        After merge fix
      mysql-test/extra/rpl_tests/rpl_log.test:
        Fixed failing test case
      6f5c5c3c
  4. 18 Jun, 2006 4 commits
    • unknown's avatar
      Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql · 8136f005
      unknown authored
      into moonbone.local:/work/tmp_merge-5.0-opt-mysql
      
      8136f005
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · cb2f34ed
      unknown authored
      into moonbone.local:/work/tmp_merge-5.0-opt-mysql
      
      
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      cb2f34ed
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 12dedeb4
      unknown authored
      into moonbone.local:/work/tmp_merge-4.1-opt-mysql
      
      12dedeb4
    • unknown's avatar
      Manually merged · 05466abf
      unknown authored
      
      configure.in:
        Auto merged
      client/mysqlbinlog.cc:
        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/cast.result:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/func_group.result:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/multi_update.result:
        Auto merged
      mysql-test/r/ndb_lock.result:
        Auto merged
      mysql-test/r/replace.result:
        Auto merged
      mysql-test/r/union.result:
        Auto merged
      mysql-test/t/archive.test:
        Auto merged
      mysql-test/t/auto_increment.test:
        Auto merged
      mysql-test/t/delayed.test:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/multi_update.test:
        Auto merged
      mysql-test/t/ndb_lock.test:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/structs.h:
        Auto merged
      storage/archive/ha_archive.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      05466abf
  5. 17 Jun, 2006 1 commit