An error occurred fetching the project authors.
  1. 11 Dec, 2006 1 commit
  2. 08 Dec, 2006 14 commits
    • unknown's avatar
      Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge · 009c88db
      unknown authored
      into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
      
      
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqldump.c:
        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/log_event.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
      include/my_pthread.h:
        Manual merge
      009c88db
    • unknown's avatar
      Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge · 750dd5ed
      unknown authored
      into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
      
      
      sql/item_timefunc.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      750dd5ed
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl · 26b6dc42
      unknown authored
      into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
      
      
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      config/ac-macros/ha_ndbcluster.m4:
        Auto merged
      configure.in:
        Auto merged
      include/my_global.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
      sql/handler.cc:
        Auto merged
      sql/item_create.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log.h:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/rpl_injector.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_acl.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_view.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/t/mysqldump.test:
        Manual merge
      sql/log_event.cc:
        manual merge
      26b6dc42
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.0-rpl · cacaef6e
      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
      cacaef6e
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-4.1-rpl · 5aa8705a
      unknown authored
      into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
      
      
      sql/item_timefunc.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      5aa8705a
    • unknown's avatar
      Minor fix · a7985804
      unknown authored
      include/my_pthread.h:
        Fixed missing \ in #if directive.
      a7985804
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl · 42b2cb86
      unknown authored
      into  quant.(none):/ext/mysql/bk/mysql-5.0-bug24507
      
      
      sql/sql_acl.cc:
        Auto merged
      42b2cb86
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-5.0.b24158 · b8ff601e
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.1.b20396
      
      
      mysql-test/r/rpl_do_grant.result:
        Auto merged
      mysql-test/t/rpl_do_grant.test:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      b8ff601e
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 6aa09b4c
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b24158
      
      
      6aa09b4c
    • unknown's avatar
      After merge fix · 55c10a09
      unknown authored
      55c10a09
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl · df2af6cd
      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
      df2af6cd
    • unknown's avatar
      BUG#24507 (rpl_log.test crash slave): · 9f37ea45
      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.
      9f37ea45
    • unknown's avatar
      After merge fix · 75127a69
      unknown authored
      client/mysqlbinlog.cc:
        Auto merged
      mysql-test/r/user_var-binlog.result:
        Auto merged
      mysql-test/t/mysqlbinlog.test:
        Auto merged
      BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
        Auto merged
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Auto merged
      mysql-test/r/rpl_stm_charset.result:
        Auto merged
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        after merge fix.
      75127a69
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · b93baf48
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b20396
      
      
      b93baf48
  3. 07 Dec, 2006 5 commits
    • unknown's avatar
    • unknown's avatar
      Merge suse.vabb.com:/home/Chuck/development/mysql-5.1-new-rpl · f88f71a2
      unknown authored
      into  suse.vabb.com:/home/Chuck/development/mysql-5.1_WL_3618
      
      
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/table.cc:
        Auto merged
      f88f71a2
    • unknown's avatar
      WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code. · 85a8f7c7
      unknown authored
      Please see worklog for details on files changed.
      
      
      BitKeeper/deleted/.del-have_row_based.require:
        Delete: mysql-test/r/have_row_based.require
      BitKeeper/deleted/.del-not_row_based.require:
        Delete: mysql-test/r/not_row_based.require
      BitKeeper/deleted/.del-have_row_based.inc:
        Delete: mysql-test/include/have_row_based.inc
      BitKeeper/deleted/.del-not_row_based.inc:
        Delete: mysql-test/include/not_row_based.inc
      BitKeeper/deleted/.del-replication.m4:
        Delete: config/ac-macros/replication.m4
      85a8f7c7
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · e54bbaa3
      unknown authored
      into  example.com:/work/mysql-5.1-maint
      
      
      e54bbaa3
    • unknown's avatar
      Additional fix for bug#22369 · 0a22a1b9
      unknown authored
      mysql-test/t/events_bugs.test:
        let events_bugs not fail because of timing
      sql/sql_table.cc:
        if the db or name has been changed ALTER_RENAME,
        then fix table_list
        Solution by having the second table added in the parser to the
        list of used tables, won't work because checking of rights of merge
        tables goes over table_list->next_local and checks the rights, so
        we will fail there.
      sql/sql_yacc.yy:
        fix name - prevents ddd from correct working
      0a22a1b9
  4. 06 Dec, 2006 5 commits
  5. 05 Dec, 2006 15 commits