1. 15 Dec, 2006 1 commit
    • unknown's avatar
      BUG#21132 (Slave fails to reconnect on update_slave_list): · f6ecb8bd
      unknown authored
      The update_slave_list() call is a remainder from attempts to implement failsafe 
      replication. This code is now obsolete and not maintained (see comments in 
      rpl_failsafe.cc). 
      
      Inspecting the code one can see that this function do not interferre with normal 
      slave operation and thus can be safely removed. This will solve the issue 
      reported in the bug (errors on slave reconnection). 
      
      A related issue is to remove unneccessary reconnections done by slave. This is 
      handled in the patch for BUG#20435.
      
      
      sql/slave.cc:
        Removed call to obsolete function update_slave_list() upon slave's I/O thread 
        reconnect.
      f6ecb8bd
  2. 14 Dec, 2006 2 commits
    • unknown's avatar
      After merge fix for bug N22645 · 5b0c58b7
      unknown authored
      
      mysql-test/t/mysqlbinlog.test:
        After merge fix
      sql/log_event.cc:
        Fixing comment, thanks to Andrei for suggestion
      5b0c58b7
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 6a488bad
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b22645
      
      
      mysql-test/t/disabled.def:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      mysql-test/r/mysqlbinlog.result:
        After merge fix
      mysql-test/t/mysqlbinlog.test:
        After merge fix
      6a488bad
  3. 08 Dec, 2006 9 commits
    • unknown's avatar
      Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge · 6214585c
      unknown authored
      into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
      
      
      sql/item_timefunc.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      6214585c
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.0-rpl · eeb35b7e
      unknown authored
      into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
      
      
      client/mysqldump.c:
        Auto merged
      include/my_pthread.h:
        Auto merged
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/r/rpl_timezone.result:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysys/my_thr_init.c:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      eeb35b7e
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-4.1-rpl · ad828099
      unknown authored
      into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
      
      
      sql/item_timefunc.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      ad828099
    • unknown's avatar
      Minor fix · 8b78f072
      unknown authored
      
      include/my_pthread.h:
        Fixed missing \ in #if directive.
      8b78f072
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl · 33825a00
      unknown authored
      into  quant.(none):/ext/mysql/bk/mysql-5.0-bug24507
      
      
      sql/sql_acl.cc:
        Auto merged
      33825a00
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · b68c8fec
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b24158
      
      b68c8fec
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl · 5c3c7222
      unknown authored
      into  quant.(none):/ext/mysql/bk/mysql-5.0-bug24507
      
      
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      5c3c7222
    • unknown's avatar
      BUG#24507 (rpl_log.test crash slave): · f15e8a6a
      unknown authored
      The problem was located to lie inside current NPTL pthread_exit() 
      implementation. Race conditions in this code can lead to segmentation
      fault. Hovewer, this can happen only in a race between first thread 
      calling pthread_exit() and other threads. 
      
      Workaround implemented in this patch spawns a dummy thread, which
      exits immediately, during thread lib initialization. This will exclude
      segment violations when further threads exit.
       
      
      
      include/my_pthread.h:
        define macro NPTL_PTHREAD_EXIT_BUG which controls whether workaround
        in my_thread_global_init() is included or not.
      mysys/my_thr_init.c:
        Spawn a dummy thread in my_thread_global_init() to initialize pthread 
        lib internal variables.
      f15e8a6a
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · b7e2d666
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b20396
      
      b7e2d666
  4. 07 Dec, 2006 1 commit
    • unknown's avatar
      Bug#22645 LC_TIME_NAMES: Statement not replicated · 6b6bc06d
      unknown authored
      Implementing event based replication of LC_TIME_NAMES for 5.0
      (as a replacement of previously made ONE_SHOT replication)
      
      
      mysql-test/r/mysqlbinlog.result:
        Fixing results
      mysql-test/r/rpl_locale.result:
        Fixing results
      mysql-test/t/disabled.def:
        Enabling rpl_locale
      mysql-test/t/mysqlbinlog.test:
        Check "mysqlbinlog | mysql" reproduces lc_time_names correctly.
      mysql-test/t/rpl_locale.test:
        Adding new test: that setting lc_time_names back to en_US works fine.
      sql/log_event.cc:
        Implementing event based replication of LC_TIME_NAMES for 5.0
        (as a replacement of previously made ONE_SHOT replication)
      sql/log_event.h:
        Adding new Q_*_CODE
        Adding "lc_time_names_number" members into Query_log_event and PRINT_EVENT_INFO
      6b6bc06d
  5. 06 Dec, 2006 3 commits
  6. 05 Dec, 2006 14 commits
  7. 04 Dec, 2006 10 commits
    • unknown's avatar
      Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint · be59974a
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/tmp/mysql-5.0-maint
      
      be59974a
    • unknown's avatar
      Disabled flush2 until pushbuild framework can handle test which · 963ccc4f
      unknown authored
      disables binlog.
      
      
      mysql-test/t/disabled.def:
        disabled test flush2.
      963ccc4f
    • unknown's avatar
      Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836 · 4a847016
      unknown authored
      into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
      
      
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      4a847016
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 645c04e8
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      Makefile.am:
        Auto merged
      client/mysqltest.c:
        Auto merged
      myisam/mi_open.c:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      645c04e8
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · fd3904f4
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      BitKeeper/etc/ignore:
        auto-union
      Docs/Makefile.am:
        Auto merged
      Makefile.am:
        Auto merged
      client/mysql.cc:
        Auto merged
      client/mysqltest.c:
        Auto merged
      include/Makefile.am:
        Auto merged
      myisam/myisampack.c:
        Auto merged
      mysql-test/lib/mtr_io.pl:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/view_grant.result:
        Auto merged
      mysql-test/t/view_grant.test:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      extra/yassl/taocrypt/include/algebra.hpp:
        Manual merge with import of upstream yaSSL
      fd3904f4
    • unknown's avatar
      mysqltest · f009c12e
      unknown authored
      Close any statements that might be open before program exit
      Close any statments that might be open when calling "disable_ps_protocol"
      
      
      client/mysqltest.c:
        Close any statements that might be open before program exit
        Close any statments that might be open when calling "disable_ps_protocol"
      f009c12e
    • unknown's avatar
      mysql-test-run.pl: Append .nlm to the binary name on NetWare · 10974bc2
      unknown authored
      
      mysql-test/lib/mtr_misc.pl:
        Append .nlm to the binary name on NetWare
      10974bc2
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 52748172
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      52748172
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · 21740227
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      Makefile.am:
        Auto merged
      client/mysqltest.c:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      21740227
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-maint · ba441943
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      ba441943