1. 27 Dec, 2006 1 commit
    • unknown's avatar
      Bug#24747 XPath error with the node name "Text" · 3f13fa18
      unknown authored
      
      mysql-test/r/xml.result:
        Adding test case
      mysql-test/t/xml.test:
        Adding test case
      sql/item_xmlfunc.cc:
        Bug#24747 XPath error with the node name "Text"
        
        Problem: keywords, nodetype names and axis names
        didn't work in node name context.
        
        Fix:
        1. Changes in lexem scanner behaviour when an identifier has been read:
        - search through axis names and return MY_XPATH_AXIS_xxx only
          when identifier is followed by two semicolons. Don't check axis
          names and return MY_XPATH_IDENT of not followed by two semicolons.
        - search through nodetype names and return MY_XPATH_LEX_NODETYPE
          only when identifier is followed by left parenthesis.
          Don't check nodetype names and return MY_XPATH_LEX_IDENT when
          not followed by parenthesis
        2. Change in syntax analizer: QName scanner now accepts keywords 
           AND, OR, MOD, DIV as valid node names.
      3f13fa18
  2. 22 Dec, 2006 2 commits
  3. 14 Dec, 2006 5 commits
    • unknown's avatar
      After merge fix for Bug N22645 · c5966960
      unknown authored
      c5966960
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-5.0.b22645 · 5ea4f05a
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.1.b22645
      
      
      mysql-test/t/mysqlbinlog.test:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      mysql-test/t/disabled.def:
        SCCS merged
      5ea4f05a
    • 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
    • unknown's avatar
      Bug#17642 mysqlbinlog: Restore from row-based binlog fails · 3ff0a0d5
      unknown authored
      Problem: mysqlbinlog_base64 failed sporadically.
      
      Reason: Missing "flush logs" before running $MYSQL_BINLOG,
      which could start dumping the log file before server
      has finished writting into it.
      Fix:
      - implementing --force-if-open option to "mysqlbinlog"
      - adding --disable-force-if-open to make $MYSQL_BINLOG
        fail on non-closed log files, to garantee that nobody
        will forget "flush logs" in the future.
      - adding "flush logs" into all affected tests.
      
      
      client/mysqlbinlog.cc:
        Implementing --force-if-open option with TRUE by default
      mysql-test/mysql-test-run.pl:
        Using --disable-force-if-open for all tests to avoid
        sporadic test failures because of running "mysqlbinlog"
        on a non-flushed binlog files.
      mysql-test/r/binlog_row_mix_innodb_myisam.result:
        FLush log before running dumping.
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        FLush log before running dumping.
      mysql-test/r/mysqlbinlog.result:
        FLush log before running dumping.
      mysql-test/r/mysqlbinlog2.result:
        FLush log before running dumping.
      mysql-test/r/mysqlbinlog_base64.result:
        FLush log before running dumping.
      mysql-test/r/user_var-binlog.result:
        FLush log before running dumping.
      mysql-test/t/binlog_row_mix_innodb_myisam.test:
        FLush log before running dumping.
      mysql-test/t/binlog_stm_mix_innodb_myisam.test:
        FLush log before running dumping.
      mysql-test/t/mysqlbinlog.test:
        FLush log before running dumping.
        
        Adding new tests:
        - checking that $MYSQL_BINLOG returns an error on a non-closed binlog
        file because of --disable-force-if-open
        - checking that it does not return an error with --force-if-open
      mysql-test/t/mysqlbinlog2.test:
        FLush log before running dumping.
      mysql-test/t/mysqlbinlog_base64.test:
        FLush log before running dumping.
      mysql-test/t/user_var-binlog.test:
        FLush log before running dumping.
      3ff0a0d5
  4. 11 Dec, 2006 5 commits
  5. 08 Dec, 2006 14 commits
    • unknown's avatar
      Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge · 56c0eead
      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
      56c0eead
    • 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.1-new-rpl · bbf88111
      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
      bbf88111
    • 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 mysql.com:/usr/home/bar/mysql-5.0.b24158 · 07e5041f
      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
      07e5041f
    • 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
      After merge fix · 2dd34494
      unknown authored
      2dd34494
    • 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
      After merge fix · 08c4515f
      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.
      08c4515f
    • 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
  6. 07 Dec, 2006 6 commits
    • unknown's avatar
    • unknown's avatar
      Merge suse.vabb.com:/home/Chuck/development/mysql-5.1-new-rpl · c46885d6
      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
      c46885d6
    • unknown's avatar
      WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code. · d71fb7b7
      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
      d71fb7b7
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 6bcdfc44
      unknown authored
      into  example.com:/work/mysql-5.1-maint
      
      6bcdfc44
    • unknown's avatar
      Additional fix for bug#22369 · 2fbf1a2c
      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
      2fbf1a2c
    • 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
  7. 06 Dec, 2006 5 commits
  8. 05 Dec, 2006 2 commits