An error occurred fetching the project authors.
  1. 02 Apr, 2007 6 commits
  2. 31 Mar, 2007 4 commits
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · ee10d9e7
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
      
      
      mysql-test/r/mysqlbinlog.result:
        Auto merged
      mysql-test/t/mysqlbinlog.test:
        Auto merged
      ee10d9e7
    • unknown's avatar
      Add correct replace · 407389ba
      unknown authored
      407389ba
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · bea9525a
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
      
      
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/t/mysqlbinlog.test:
        Merge 5.0->5.1
      bea9525a
    • unknown's avatar
      Bug#27049 Race condition in test mysqlbinlog.test · ff979b76
      unknown authored
       - Add --local-load option to avoidthat the load data file requested
         by mysqlbinlog end up in local var/tmp dir and not in system global
         tmpdir
      
      
      mysql-test/t/mysqlbinlog.test:
        Add --local-load option to avoidthat the load data file requested
        by mysqlbinlog end up in local var/tmp dir and not in system global
        tmpdir
      ff979b76
  3. 30 Mar, 2007 3 commits
  4. 29 Mar, 2007 27 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new-maint · 0b5f0923
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
      
      
      0b5f0923
    • unknown's avatar
      Update result for bug#19991 · b07be12e
      unknown authored
      b07be12e
    • unknown's avatar
      Post Merge Cleanup. · b35b11ee
      unknown authored
      mysql-test/r/mysqldump.result:
        Post Merge Cleanup
      b35b11ee
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 480c30d9
      unknown authored
      into  recycle.(none):/src/bug23491/my50-bug23491
      
      
      mysql-test/t/mysqldump.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/mysqldump.result:
        SCCS merged
      480c30d9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 7c27a05a
      unknown authored
      into  recycle.(none):/src/bug23491/my51-bug23491
      
      
      mysql-test/t/mysqldump.test:
        Auto merged
      sql/item_create.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/mysqldump.result:
        SCCS merged
      7c27a05a
    • unknown's avatar
      Bug #23491 MySQLDump prefix function call in a view by database name · 09eff0aa
      unknown authored
      - 5.0 merged to 5.1 differences.
      
      
      sql/item_create.cc:
        Bug #23491 MySQLDump prefix function call in a view by database name
        - Added use_explicit_name to Create_sp_func::create method.
        - Default use_explicit_name to false when db name not specified.
        - Use use_explicit_name when creating sp_name object.
      sql/item_create.h:
        Bug #23491 MySQLDump prefix function call in a view by database name
        - Updated virtual function definition.
      sql/sql_yacc.yy:
        Bug #23491 MySQLDump prefix function call in a view by database name
        - Use new create method.
      09eff0aa
    • unknown's avatar
      Bug#26922 Test 'varbinary' fails to do copy_file on Windows · 16977146
      unknown authored
      - Copy all *.MY* files from std_data/, we have some .MYD and .MYI
      files from 4.1 there
      5.0 version of make_win_bin_dist copies everything in std_data/
      
      
      scripts/make_win_bin_dist:
        Copy all *.MY* files from std_data/, we have some .MYD and .MYI
        files from 4.1 there
        5.0 version of make_win_bin_dist copies everything in std_data/
      16977146
    • unknown's avatar
      Merge recycle.(none):/src/bug23491/my50-bug23491 · 1edf3685
      unknown authored
      into  recycle.(none):/src/bug23491/my51-bug23491
      
      
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/sp-code.result:
        Auto merged
      mysql-test/r/udf.result:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      mysql-test/r/mysqldump.result:
        Manual Merge.
      sql/sql_yacc.yy:
        Manual Merge.
      1edf3685
    • unknown's avatar
      After merge fixes · 9bf9e226
      unknown authored
      BitKeeper/deleted/.del-rpl_ssl_verify_server.test:
        Delete: mysql-test/t/rpl_ssl_verify_server.test
      BitKeeper/deleted/.del-rpl_ssl_verify_server.result:
        Delete: mysql-test/r/rpl_ssl_verify_server.result
      mysql-test/r/rpl_known_bugs_detection.result:
        Add new column after merge
      mysql-test/r/rpl_ssl.result:
        Add new column after merge
      mysql-test/r/rpl_ssl1.result:
        Merge test and result file
      mysql-test/t/rpl_ssl1.test:
        Merge test and result file
      9bf9e226
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/bug19991/my51-bug19991 · d86d393f
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
      
      
      mysql-test/r/rpl_replicate_do.result:
        Auto merged
      mysql-test/r/rpl_slave_status.result:
        Auto merged
      mysql-test/r/rpl_stm_log.result:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/t/rpl_ssl1.test:
        Auto merged
      d86d393f
    • unknown's avatar
      Bug#19991 CHANGE MASTER need option ssl-verify-server-cert · d6422f61
      unknown authored
       - Add MASTER_SSL_VERIFY_SERVER_CERT option to CHANGE MASTER TO
       - Add Master_Ssl_Serify_Server_Cert to SHOW SLAVE STATUS
       - Save and restore ssl_verify_server_cert  to master info file
         setting it to disabled as default.
      
      
      mysql-test/r/rpl_000015.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_change_master.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_empty_master_crash.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_flushlog_loop.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_loaddata.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_log_pos.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_rbr_to_sbr.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_redirect.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_replicate_do.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_rotate_logs.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_row_max_relay_size.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_server_id1.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_server_id2.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_slave_status.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_ssl1.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_stm_log.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_stm_max_relay_size.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_stm_reset_slave.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_stm_until.result:
        Update test result after adding new column to SHOW SLAVE STATUS
      mysql-test/t/rpl_ssl1.test:
        Change to "query_vertical show slave status"
      sql/lex.h:
        Add new token for MASTER_SSL_VERIFY_SERVER_CERT
      sql/repl_failsafe.cc:
        Turn on verification of master cert if so requested
      sql/rpl_mi.cc:
        Add new variable to MASTER_INFo and save/restore it from/to line 15 of master info
        file
      sql/rpl_mi.h:
        Add variable for ssl_verify_server_cert to MASTER_INFO
      sql/slave.cc:
        Turn on verification of master cert if so requested
        Add new column to SHOW  SLAVE STATUS
      sql/sql_lex.h:
        Add ssl_verify_server_cert to "st_lex_master_info" struct - allow
        it to be UNCHANGED just like the ssl option.
      sql/sql_repl.cc:
        Add ssl_verify_server_cert to "st_lex_master_info" struct - allow
        it to be UNCHANGED just like the ssl option.
      sql/sql_yacc.yy:
        Add MASTER_SSL_VERIFY_SERVER_CERT to CHANGE MASTER TO
      mysql-test/t/rpl_ssl_verify_server.test:
        New BitKeeper file ``mysql-test/t/rpl_ssl_verify_server.test''
      mysql-test/r/rpl_ssl_verify_server.result:
        New BitKeeper file ``mysql-test/r/rpl_ssl_verify_server.result''
      d6422f61
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 42c650e8
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
      
      
      42c650e8
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 8dc103f8
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      8dc103f8
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 7cfc90e0
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
      
      
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/t/rpl_ignore_table.test:
        Merge, move the sync_slave_with_master up to correct place
      7cfc90e0
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/bug25482/my41-bug25482-alt2 · dd6dbea1
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
      
      
      dd6dbea1
    • unknown's avatar
      Update test result after merge · fff440d9
      unknown authored
      fff440d9
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-maint · d862d3b6
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
      
      
      d862d3b6
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/bug25482/my41-bug25482-alt2 · 09f1a842
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/rpl_ignore_table.result:
        Merge
      mysql-test/t/rpl_ignore_table.test:
        Merge, add a connection master to run following test on master
      09f1a842
    • unknown's avatar
      Bug#25482 GRANT statements are not replicated if you use "replicate-ignore-table" · a5c60b3f
      unknown authored
       - GRANT and REVOKE statments didn't have the "updating" flag set and
         thus statements with a table specified would not replicate if
         slave filtering rules where turned on.
         For example "GRANT ... ON test.t1 TO ..." would not replicate.
      
      
      mysql-test/r/rpl_ignore_table.result:
        Add test results
      mysql-test/t/rpl_ignore_table.test:
        Add tests
      sql/sql_yacc.yy:
        Pass option TL_OPTION_UPDATING to 'add_table_to_list' when parsing a
        GRANT or REVOKE and a table specifier is found. This will set the
        property "updating" on the table and thus the slave filtering rules will 
        be applied.
        
        Without setting updating the statement will be not
        replicated - since "it's not updating anything" - an optimization
        to quickly skip SELECT's and similar.
      a5c60b3f
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new-maint · 377ac4f1
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
      
      
      377ac4f1
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · ff0f7dc5
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      ff0f7dc5
    • unknown's avatar
      Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · 90e01b9c
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
      
      
      90e01b9c
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my50-bug24121 · 16995bb7
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      16995bb7
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my51-bug24121 · 8add0bcc
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
      
      
      8add0bcc
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 722861e2
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
      
      
      722861e2
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · dcf361ea
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
      
      
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/t/openssl_1.test:
        Auto merged
      mysql-test/t/strict.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      dcf361ea
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · eb8ca32c
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      eb8ca32c