mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45269 commits 2780 branches 343 tags 1.6 GiB
Commit graph

7 commits

Author SHA1 Message Date
unknown
f65cb96b60 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/client_priv.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/rpl_deadlock_innodb.result:
  Auto merged
mysql-test/r/rpl_flushlog_loop.result:
  Auto merged
mysql-test/r/rpl_known_bugs_detection.result:
  Auto merged
mysql-test/r/rpl_ndb_basic.result:
  Auto merged
mysql-test/r/rpl_ndb_extraCol.result:
  Auto merged
mysql-test/r/rpl_ndb_sync.result:
  Auto merged
mysql-test/r/rpl_rbr_to_sbr.result:
  Auto merged
mysql-test/r/rpl_row_inexist_tbl.result:
  Auto merged
mysql-test/r/rpl_row_max_relay_size.result:
  Auto merged
mysql-test/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
mysql-test/r/rpl_stm_max_relay_size.result:
  Auto merged
mysql-test/r/rpl_stm_until.result:
  Auto merged
mysql-test/r/sp-code.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/gis.result:
  Merge 5.0->5.1
mysql-test/r/rpl_000015.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_change_master.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_loaddata.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_log_pos.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_ndb_log.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_rotate_logs.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_row_log.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_row_log_innodb.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_row_reset_slave.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_row_until.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_server_id1.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_server_id2.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_stm_log.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_stm_reset_slave.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/t/gis.test:
  Merge 5.0->5.1
 2007-04-02 11:15:09 +02:00
unknown
c4bab45b96 Post merge fixes of result files. 
mysql-test/r/binlog_stm_binlog.result:
  Result change.
mysql-test/r/binlog_stm_ctype_ucs.result:
  Result change.
mysql-test/r/binlog_stm_insert_select.result:
  Result change.
mysql-test/r/ctype_cp932_binlog_stm.result:
  Result change.
mysql-test/r/flush_block_commit_notembedded.result:
  Result change.
mysql-test/r/rpl_000015.result:
  Result change.
mysql-test/r/rpl_change_master.result:
  Result change.
mysql-test/r/rpl_deadlock_innodb.result:
  Result change.
mysql-test/r/rpl_flushlog_loop.result:
  Result change.
mysql-test/r/rpl_known_bugs_detection.result:
  Result change.
mysql-test/r/rpl_loaddata.result:
  Result change.
mysql-test/r/rpl_loaddata_s.result:
  Result change.
mysql-test/r/rpl_log_pos.result:
  Result change.
mysql-test/r/rpl_rbr_to_sbr.result:
  Result change.
mysql-test/r/rpl_rotate_logs.result:
  Result change.
mysql-test/r/rpl_row_max_relay_size.result:
  Result change.
mysql-test/r/rpl_server_id1.result:
  Result change.
mysql-test/r/rpl_server_id2.result:
  Result change.
mysql-test/r/rpl_sp.result:
  Result change.
mysql-test/r/rpl_stm_charset.result:
  Result change.
mysql-test/r/rpl_stm_flsh_tbls.result:
  Result change.
mysql-test/r/rpl_stm_log.result:
  Result change.
mysql-test/r/rpl_stm_max_relay_size.result:
  Result change.
mysql-test/r/rpl_stm_multi_query.result:
  Result change.
mysql-test/r/rpl_stm_reset_slave.result:
  Result change.
mysql-test/r/rpl_stm_until.result:
  Result change.
mysql-test/r/rpl_switch_stm_row_mixed.result:
  Result change.
mysql-test/r/rpl_truncate_2myisam.result:
  Result change.
mysql-test/r/rpl_truncate_3innodb.result:
  Result change.
mysql-test/r/rpl_truncate_7ndb.result:
  Result change.
mysql-test/r/user_var-binlog.result:
  Result change.
 2007-03-30 04:44:49 +02:00
unknown
d6422f61ba Bug#19991 CHANGE MASTER need option ssl-verify-server-cert 
- 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''
 2007-03-29 15:09:57 +02:00
unknown
a0e0166ba5 BUG#22583: RBR between MyISAM and non-MyISAM tables containing a BIT 
field does not work

Fix to prevent MyISAM from reading data from NULL BLOB.
Fix to make record comparison independent of values of unused bits in
record.
Updating binlog positions in tests.


mysql-test/extra/rpl_tests/rpl_multi_query.test:
  Binlog position change
mysql-test/extra/rpl_tests/rpl_stm_charset.test:
  Binlog position change
mysql-test/include/show_binlog_events.inc:
  Binlog position change
mysql-test/r/binlog_stm_binlog.result:
  Result change
mysql-test/r/binlog_stm_ctype_ucs.result:
  Result change
mysql-test/r/binlog_stm_insert_select.result:
  Result change
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Result change
mysql-test/r/ctype_cp932_binlog_stm.result:
  Result change
mysql-test/r/ndb_binlog_multi.result:
  Result change
mysql-test/r/rpl_known_bugs_detection.result:
  Result change
mysql-test/r/rpl_loaddata.result:
  Result change
mysql-test/r/rpl_loaddata_s.result:
  Result change
mysql-test/r/rpl_ndb_charset.result:
  Result change
mysql-test/r/rpl_ndb_extraCol.result:
  Result change
mysql-test/r/rpl_ndb_log.result:
  Result change
mysql-test/r/rpl_ndb_multi.result:
  Result change
mysql-test/r/rpl_rbr_to_sbr.result:
  Result change
mysql-test/r/rpl_rotate_logs.result:
  Result change
mysql-test/r/rpl_sp.result:
  Result change
mysql-test/r/rpl_stm_charset.result:
  Result change
mysql-test/r/rpl_stm_flsh_tbls.result:
  Result change
mysql-test/r/rpl_stm_log.result:
  Result change
mysql-test/r/rpl_stm_max_relay_size.result:
  Result change
mysql-test/r/rpl_stm_multi_query.result:
  Result change
mysql-test/r/rpl_stm_reset_slave.result:
  Result change
mysql-test/r/rpl_stm_until.result:
  Result change
mysql-test/r/rpl_truncate_7ndb.result:
  Result change
mysql-test/r/user_var-binlog.result:
  Result change
mysql-test/t/binlog_stm_mix_innodb_myisam.test:
  Binlog position change
mysql-test/t/ctype_cp932_binlog_stm.test:
  Binlog position change
mysql-test/t/mysqlbinlog.test:
  Binlog position change
mysql-test/t/mysqlbinlog2.test:
  Binlog position change
mysql-test/t/rpl_sp.test:
  Binlog position change
mysql-test/t/rpl_stm_flsh_tbls.test:
  Binlog position change
sql/log_event.cc:
  Emptying the record entirely since it appears MyISAM reads blob column
  data even when they are NULL.
  
  Adding code to set unused bits of the records before doing a comparison,
  and restoring the original values after. Setting the unused bits is necessary
  since NDB does not set them correctly, and resetting them afterwards is needed
  because MyISAM compares the record with the one located when updating
  or deleting it.
mysql-test/r/rpl_row_basic_11bugs-master.opt:
  New BitKeeper file ``mysql-test/r/rpl_row_basic_11bugs-master.opt''
mysql-test/r/rpl_row_basic_11bugs-slave.opt:
  New BitKeeper file ``mysql-test/r/rpl_row_basic_11bugs-slave.opt''
 2007-03-20 08:52:01 +01:00
unknown
930e542f44 Changes made according to HLD/LLD. 
The following is an excerption from the WL.
      
   1. Change so that MIXED is default format
      1.1 to change the default for command line --binlog-format
      1.2 to alter global_system_variables.binlog_format calculation
          basing on command line --binlog-format parameter and 
          its default.
   2. Change test suite so that more testing is done by MIXED format.
      2.1 to check if there are test cases requiring --binlog-foramt=statement via
          `source include/have_binlog_format_statement.inc' and affected by 
          altering the latter to be "mixed".
      2.2 to check the content of such vulnerable cases to find if
          extending to the mixed does not modify results. In that case simply
          substitute source arguments as explained.
      2.3 if a test in mixed mode deals with features triggering
          row-binlogging then if necessary we can switch explicitly
          to statement mode or create another test to run with 
          non-recommended STATEMENT mode
   
          Particullarily, extracting INSERT DELAYED 
          binlogging subtest for statement mode is performed, and 
          the snippet is moved into a separate test file.
          Note that since now all three modes verify this use case
          through 3 different tests.
   
   No changes in item 3 of HLD appeared to be needed.


mysql-test/extra/binlog_tests/binlog.test:
  Moving INSERT DELAYED verification section into separate file. The latter is sourced
  from two different files: the current one and a newly created for STATEMENT
  mode check.
mysql-test/extra/rpl_tests/rpl_loaddata.test:
  require mixed_or_statement
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
  require mixed_or_statement
mysql-test/extra/rpl_tests/rpl_stm_charset.test:
  require mixed_or_statement
mysql-test/r/binlog_stm_binlog.result:
  new result to correspond to MIXED mode.
mysql-test/r/rpl_rbr_to_sbr.result:
  result changed
mysql-test/t/archive.test:
  require mixed_or_statement
mysql-test/t/binlog_stm_binlog.test:
  require exclusive mixed format because of INSERT DELAYED.
mysql-test/t/binlog_stm_blackhole.test:
  require mixed_or_statement
mysql-test/t/binlog_stm_ctype_cp932.test:
  require mixed_or_statement
mysql-test/t/binlog_stm_ctype_ucs.test:
  require mixed_or_statement
mysql-test/t/binlog_stm_drop_tmp_tbl.test:
  require mixed_or_statement
mysql-test/t/binlog_stm_innodb_stat.test:
  require mixed_or_statement
mysql-test/t/binlog_stm_insert_select.test:
  require mixed_or_statement
mysql-test/t/binlog_stm_mix_innodb_myisam.test:
  require mixed_or_statement
mysql-test/t/create_select_tmp.test:
  require mixed_or_statement
mysql-test/t/ctype_cp932_binlog_stm.test:
  require mixed_or_statement
mysql-test/t/date_formats.test:
  MIXED case appended to the replace instruction
mysql-test/t/mysqlbinlog.test:
  require mixed_or_statement
mysql-test/t/mysqlbinlog2.test:
  require mixed_or_statement
mysql-test/t/ndb_multi.test:
  require mixed_or_statement
mysql-test/t/rpl000013.test:
  require mixed_or_statement
mysql-test/t/rpl_heap.test:
  require mixed_or_statement
mysql-test/t/rpl_loaddata_s.test:
  require mixed_or_statement
mysql-test/t/rpl_mixed_ddl_dml.test:
  require mixed_or_statement
mysql-test/t/rpl_rbr_to_sbr.test:
  Rather meaningless line is discarded.
  The test does not loose anything without it and without considering the WL.
mysql-test/t/rpl_rewrt_db.test:
  require mixed_or_statement
mysql-test/t/rpl_rotate_logs.test:
  require mixed_or_statement
mysql-test/t/rpl_stm_EE_err2.test:
  require mixed_or_statement
mysql-test/t/rpl_stm_flsh_tbls.test:
  require mixed_or_statement
mysql-test/t/rpl_stm_log.test:
  require mixed_or_statement
mysql-test/t/rpl_stm_max_relay_size.test:
  require mixed_or_statement
mysql-test/t/rpl_stm_multi_query.test:
  require mixed_or_statement
mysql-test/t/rpl_stm_mystery22.test:
  require mixed_or_statement
mysql-test/t/rpl_stm_no_op.test:
  require mixed_or_statement
mysql-test/t/rpl_stm_reset_slave.test:
  require mixed_or_statement
mysql-test/t/rpl_stm_until.test:
  require mixed_or_statement
mysql-test/t/rpl_temp_table.test:
  require mixed_or_statement
mysql-test/t/rpl_trigger.test:
  require mixed_or_statement
mysql-test/t/rpl_trunc_temp.test:
  require mixed_or_statement
mysql-test/t/user_var-binlog.test:
  require mixed_or_statement
sql/mysqld.cc:
  Implementation of making BINLOG_FORMAT_MIXED to be the default of
  global_system_variables.binlog_format. Not in the case of embedded.
mysql-test/extra/binlog_tests/binlog_insert_delayed.test:
  Snippend sourced from two tests to verify INSERT DELAYED in all three binlog formats.
mysql-test/include/have_binlog_format_mixed.inc:
  Part of exclusive MIXED format requirement
mysql-test/include/have_binlog_format_mixed_or_statement.inc:
  requirement to have mixed or statement. Most of the tests with STATEMENT format indeed
  are tolerant to MIXED format to yield the same result files. There are few exception
  because of features triggering RBR events when MIXED format.
mysql-test/r/binlog_statement_insert_delayed.result:
  BitKeeper file /home/elkin/MySQL/TEAM/FIXES/5.1/wl3368_mixed_default/mysql-test/r/binlog_statement_insert_delayed.result
mysql-test/r/have_binlog_format_mixed.require:
  Exclusive MIXED format
mysql-test/t/binlog_statement_insert_delayed.test:
  BitKeeper file /home/elkin/MySQL/TEAM/FIXES/5.1/wl3368_mixed_default/mysql-test/t/binlog_statement_insert_delayed.test
 2006-08-30 10:22:43 +03:00
unknown
a25060978f Re-enabling rpl_rbr_to_sbr.test as BUG#18108 was fixed 
(nothing to document, this bug was not released).



mysql-test/t/disabled.def:
  bug is fixed, enabling test case
mysql-test/t/rpl_rbr_to_sbr.test:
  making test portable
mysql-test/r/rpl_rbr_to_sbr.result:
  result update
 2006-03-14 14:21:28 +01:00
unknown
1b4516d1f4 WL#3171: Dynamic logging format 
Removed error on seeing table map event when slave is in SBR mode
  and switching temporarily to RBR mode to replicate the rows.


sql/log_event.cc:
  Settig binlog format to "row" on seeing a table map event.
  Resetting binlog format on error and seeing STMT_END_F.
sql/sql_class.h:
  Adding method to unconditially set binlog format to "row".
mysql-test/r/rpl_rbr_to_sbr.result:
  New BitKeeper file ``mysql-test/r/rpl_rbr_to_sbr.result''
mysql-test/t/rpl_rbr_to_sbr.test:
  New BitKeeper file ``mysql-test/t/rpl_rbr_to_sbr.test''
 2006-03-08 06:55:21 +01:00