Add the cleanup by dropping the database 'track' in test "rpl_bug31076".
mysql-test/suite/rpl/r/rpl_bug31076.result:
Fix bug#31150 "Test case does not cleanup":
Drop the database 'track' which was newly created for this test.
mysql-test/suite/rpl/t/rpl_bug31076.test:
Fix bug#31150 "Test case does not cleanup":
Drop the database 'track' which was newly created for this test.
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
Auto merged
mysql-test/suite/ndb/r/ndb_dd_basic.result:
Auto merged
sql/field.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
into trift2.:/MySQL/M51/push-5.1
This is mysql-5.1.22-rc.
mysql-test/r/innodb_mysql.result:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_select.cc:
Manual merge - the 31001 bug is already fixed.
mysql-test/include/mix1.inc:
Manual merge - should not have conflicted at all.
into trift-lap.fambruehe:/MySQL/M51/antony-5.1
Makefile.am:
Auto merged
configure.in:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Use most current version of test results.
mysql-test/suite/funcs_1/r/memory__datadict.result:
Use most current version of test results.
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Use most current version of test results.
mysql-test/suite/funcs_1/r/ndb__datadict.result:
Use most current version of test results.
into hynda.mysql.fi:/home/my/mysql-maria
BitKeeper/etc/ignore:
auto-union
BUILD/SETUP.sh:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~99a50df6:
Auto merged
Makefile.am:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
include/Makefile.am:
Auto merged
include/keycache.h:
Auto merged
include/m_string.h:
Auto merged
include/my_sys.h:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/extra/rpl_tests/rpl_insert_delayed.test:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_misc.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/lib/mtr_timer.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/suite/ndb/r/ps_7ndb.result:
Auto merged
mysql-test/suite/rpl/r/rpl_events.result:
Auto merged
mysql-test/suite/rpl/r/rpl_insert.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_insert_delayed.result:
Auto merged
mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result:
Auto merged
mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result:
Auto merged
mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result:
Auto merged
mysql-test/suite/rpl/t/rpl_insert.test:
Auto merged
mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test:
Auto merged
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/view.test:
Auto merged
mysys/array.c:
Auto merged
mysys/mf_keycache.c:
Auto merged
mysys/my_init.c:
Auto merged
mysys/my_symlink2.c:
Auto merged
mysys/safemalloc.c:
Auto merged
mysys/thr_lock.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
sql/handler.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_xmlfunc.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_test.cc:
Auto merged
sql/table.h:
Auto merged
sql/udf_example.c:
Auto merged
sql/uniques.cc:
Auto merged
sql/unireg.cc:
Auto merged
storage/csv/ha_tina.h:
Auto merged
storage/myisam/ft_boolean_search.c:
Auto merged
storage/myisam/ft_nlq_search.c:
Auto merged
storage/myisam/ft_parser.c:
Auto merged
storage/myisam/ft_stopwords.c:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/ha_myisam.h:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_create.c:
Auto merged
storage/myisam/mi_delete.c:
Auto merged
storage/myisam/mi_dynrec.c:
Auto merged
storage/myisam/mi_extra.c:
Auto merged
storage/myisam/mi_key.c:
Auto merged
storage/myisam/mi_locking.c:
Auto merged
storage/myisam/mi_log.c:
Auto merged
storage/myisam/mi_packrec.c:
Auto merged
storage/myisam/mi_rkey.c:
Auto merged
storage/myisam/mi_search.c:
Auto merged
storage/myisam/mi_test1.c:
Auto merged
storage/myisam/mi_test2.c:
Auto merged
storage/myisam/mi_update.c:
Auto merged
storage/myisam/mi_write.c:
Auto merged
storage/myisam/myisamchk.c:
Auto merged
storage/myisam/myisamlog.c:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/myisam/sort.c:
Auto merged
storage/myisam/sp_test.c:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
storage/myisammrg/ha_myisammrg.h:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
support-files/compiler_warnings.supp:
Auto merged
client/mysqltest.c:
Manual merge between mysql-5.1 and mysql-maria
include/my_base.h:
Manual merge between mysql-5.1 and mysql-maria
include/my_global.h:
Manual merge between mysql-5.1 and mysql-maria
include/myisam.h:
Manual merge between mysql-5.1 and mysql-maria
libmysql/Makefile.shared:
Manual merge between mysql-5.1 and mysql-maria
mysql-test/r/events_logs_tests.result:
Manual merge between mysql-5.1 and mysql-maria
mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result:
Manual merge between mysql-5.1 and mysql-maria
mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test:
Manual merge between mysql-5.1 and mysql-maria
mysql-test/t/disabled.def:
Manual merge between mysql-5.1 and mysql-maria
mysql-test/t/events_logs_tests.test:
Manual merge between mysql-5.1 and mysql-maria
mysys/my_compress.c:
Manual merge between mysql-5.1 and mysql-maria
mysys/my_getsystime.c:
Manual merge between mysql-5.1 and mysql-maria
mysys/my_open.c:
Manual merge between mysql-5.1 and mysql-maria
sql/handler.cc:
Manual merge between mysql-5.1 and mysql-maria
sql/set_var.h:
Manual merge between mysql-5.1 and mysql-maria
sql/sql_class.h:
Manual merge between mysql-5.1 and mysql-maria
sql/sql_show.cc:
Manual merge between mysql-5.1 and mysql-maria
sql/sql_sort.h:
Manual merge between mysql-5.1 and mysql-maria
sql/sql_yacc.yy:
Manual merge between mysql-5.1 and mysql-maria
sql/table.cc:
Manual merge between mysql-5.1 and mysql-maria
storage/csv/ha_tina.cc:
Manual merge between mysql-5.1 and mysql-maria
storage/myisam/mi_open.c:
Manual merge between mysql-5.1 and mysql-maria
storage/myisam/myisamdef.h:
Manual merge between mysql-5.1 and mysql-maria
unittest/mysys/my_atomic-t.c:
Manual merge between mysql-5.1 and mysql-maria
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Auto merged
into trift-lap.fambruehe:/MySQL/M51/antony-5.1
mysql-test/suite/funcs_1/include/ndb_tb2.inc:
Auto merged
mysql-test/suite/funcs_1/r/innodb_views.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_views.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_cursors.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_func_view.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_storedproc_07.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_storedproc_08.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_03.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_09.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_views.result:
Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
Auto merged
sql/ha_partition.h:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
configure.in:
Version is updated already.
sql/ha_partition.cc:
Manual merge of 5.1.22 changes into main.
in following tests.
mysql-test/suite/rpl/r/rpl_bug31076.result:
Result file change.
mysql-test/suite/rpl/t/rpl_bug31076.test:
Dropping database so that following tests don't see it.
Row-based replication crashes when replicating from pre-5.1.22 to 5.1.22
due to an uninitialized variable.
sql/log_event.cc:
Initializing m_null_bits to null so that it can be detected that it
was not initialized later.
mysql-test/suite/rpl/r/rpl_bug31076.result:
New BitKeeper file ``mysql-test/suite/rpl/r/rpl_bug31076.result''
mysql-test/suite/rpl/t/rpl_bug31076.test:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_bug31076.test''
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Auto merged
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
sql/field.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_update.cc:
Auto merged
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
results changed
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
results changed
mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
calling included file with testing bug#27417,23333. bug#28960 is not an rbr bug.
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
moved SF() with side effects bugs to a separate includable file.
This test verifies STMT format whereas binlog_row test is reposible for
ROW format.
mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test:
sourced part for bugs with SF() etc having side effects of midifying
non-transactional tables.
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
results changed due to
1. tt table made temporary is it's supposed to;
2. show master status is turned into binlog pos masking-out macro
3. merge defect for select_insert::abort()
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
masking-out binlog postions in the results via
source include/show_binlog_events.inc;
sql/sql_insert.cc:
merging defect in not applied hunk for select_insert::abort() is fixed
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
follow-up of the previous manual resolve. The snippet is moved into the heading
file.
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
results changed
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
removing explicit offsets from report;
appending bug#27417,23333,28960 related snippet, addressing left TODO:s.
mysql-test/suite/rpl/r/rpl_packet.result:
results changed
mysql-test/suite/rpl/t/rpl_packet.test:
fixing row/stmt compatibility with #-ing out unneeded values
into trift2.:/MySQL/M51/push-5.1
config/ac-macros/misc.m4:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/rpl_rli.h:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
Merge with 5.0-opt.
mysql-test/r/binlog_unsafe.result:
Merge with 5.0-opt.
mysql-test/r/events_bugs.result:
Merge with 5.0-opt.
mysql-test/r/events_trans.result:
Merge with 5.0-opt.
mysql-test/r/sp.result:
Merge with 5.0-opt.
mysql-test/r/sp_gis.result:
Merge with 5.0-opt.
mysql-test/r/xml.result:
Merge with 5.0-opt.
mysql-test/suite/rpl/r/rpl_incident.result:
Merge with 5.0-opt.
mysql-test/suite/rpl/r/rpl_loaddata_fatal.result:
Merge with 5.0-opt.
mysql-test/suite/rpl/r/rpl_udf.result:
Merge with 5.0-opt.
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_dd_basic.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_dd_ddl.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_gis.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_row_format.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_single_user.result:
Merge with 5.0-opt.
Moved out a lot of code into functions from external_lock and
start_stmt
Fixed a crashing bug at memory alloc failure
Merged the stmt and all variables into one trans variable
Always register start of statement as according to the
interface of the handlers.
Also register for start of transaction when not statement commit
== not autocommit AND no begin - commit ongoing
Now that we registered in a proper manner we also needed to handle
the commit call when end of statement and transaction is ongoing
Added start_stmt_count to know when we have start of statement
for first table
mysql-test/suite/ndb/r/ndb_lock_table.result:
Added a new test case for bug30996
mysql-test/suite/ndb/t/ndb_lock_table.test:
Added a new test case for bug30996
sql/ha_ndbcluster.cc:
Moved out a lot of code into functions from external_lock and
start_stmt
Fixed a crashing bug at memory alloc failure
Merged the stmt and all variables into one trans variable
Always register start of statement as according to the
interface of the handlers.
Also register for start of transaction when not statement commit
== not autocommit AND no begin - commit ongoing
Now that we registered in a proper manner we also needed to handle
the commit call when end of statement and transaction is ongoing
Added start_stmt_count to know when we have start of statement
for first table
sql/ha_ndbcluster.h:
New functions and merged variables
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
Fix test results for pushbuild
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
Fix test results for pushbuild
mysql-test/suite/rpl/t/rpl_innodb_bug30888.test:
Fix test results for pushbuild
storage/innobase/handler/ha_innodb.cc:
resolve a VSC++ typecast compile warning.
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/rpl_rli.h:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
mysql-test/suite/ndb/r/ndb_dd_basic.result:
Auto merged
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
Auto merged
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event_old.cc:
Auto merged
sql/log_event_old.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/rpl_record.h:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/unireg.h:
Auto merged
mysql-test/suite/rpl/t/disabled.def:
Manual merge
mysql-test/suite/rpl_ndb/t/disabled.def:
Manual merge
sql/log_event.cc:
Manual merge
sql/log_event.h:
Manual merge
sql/sql_yacc.yy:
Manual merge
"Rows not deleted from innodb partitioned tables if --innodb_autoinc_lock_mode=0"
Due to a previous bugfix which initializes a previously uninitialized
variable, ha_partition::get_auto_increment() may fail to operate
correctly when the storage engine reports that it is only reserving
one value and one or more partitions have a different 'next-value'.
Currently, only affects Innodb's new-style auto-increment code which
reserves larger blocks of values and has less inter-thread contention.
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
Fix results - previous results shows symptoms of Bug30919
sql/ha_partition.cc:
Bug30919
ha_partition::write_row()
Do not insert a row if a failure occurred while generating
auto-increment value.
ha_partition::get_auto_increment()
If there is an empty 'intersection' of auto-increment values, perform
a second pass before failing because partitions may have different
auto-increment 'next-value' attributes.
storage/innobase/handler/ha_innodb.cc:
Bug30919
Only set *first_value if it is less than autoinc value. This allows
a higher value to be hinted when operating as a partitioned table.
mysql-test/suite/rpl/r/rpl_innodb_bug30919.result:
New BitKeeper file ``mysql-test/suite/rpl/r/rpl_innodb_bug30919.result''
mysql-test/suite/rpl/t/rpl_innodb_bug30919-master.opt:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug30919-master.opt''
mysql-test/suite/rpl/t/rpl_innodb_bug30919.test:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug30919.test''
"Regression: "--innodb_autoinc_lock_mode=0" (off) not same as older releases"
Bug#28430
"Failure in replication of innodb partitioned tables on row/mixed format"
Bug#30888
"Innodb table + stored procedure + row deletion = server crash"
Apply Oracle patch from Sunny
Include tests cases by Omer
Ensure that innobase_read_and_init_auto performs table autoinc lock when lock_mode = 0
No need for "if" guard around row_unlock_table_autoinc_for_mysql() because
it already performs same check.
Make autoinc_lock_mode variable read-only for duration of running mysqld process.
storage/innobase/handler/ha_innodb.cc:
Bug30907/28430
"Regression: "--innodb_autoinc_lock_mode=0" (off) not same as older releases"
"Failure in replication of innodb partitioned tables on row/mixed format"
Apply Oracle patch from Sunny
Ensure that innobase_read_and_init_auto performs table autoinc lock when lock_mode = 0
No need for "if" guard around row_unlock_table_autoinc_for_mysql() because
it already performs same check.
Make autoinc_lock_mode variable read-only for duration of running mysqld process.
storage/innobase/row/row0sel.c:
Bug30888
"Innodb table + stored procedure + row deletion = server crash"
Remove endian-specific code.
Fix function row_search_autoinc_read_column() to handle any integer size up to 8 bytes.
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
New BitKeeper file ``mysql-test/suite/rpl/r/rpl_innodb_bug28430.result''
mysql-test/suite/rpl/r/rpl_innodb_bug30888.result:
New BitKeeper file ``mysql-test/suite/rpl/r/rpl_innodb_bug30888.result''
mysql-test/suite/rpl/t/rpl_innodb-master.opt:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb-master.opt''
mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt''
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug28430.test''
mysql-test/suite/rpl/t/rpl_innodb_bug30888.test:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug30888.test''
- Updated row help count information
- Added missing 'order by' clauses (altrady fixed in build tree)
- Fixed isses with ndb_storeproc06/10 tests (added use database)
- Corrected use of wrong engine in ndb tests (already fixed in build tree)
- Update to ndb__datadict to replect additional fields in I_S (already corrected in build tree)
mysql-test/suite/funcs_1/include/ndb_tb2.inc:
Correction of wrong engine used for ndb test
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_views.result:
Updated result file
mysql-test/suite/funcs_1/r/memory__datadict.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_views.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_views.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb__datadict.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_cursors.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_func_view.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_06.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_07.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_08.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_10.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_03.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_09.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_views.result:
Updated result file
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
Updated test file enforcing 'use database' after connect
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
Updated test file enforcing 'use database' after connect
mysql-test/suite/funcs_1/views/views_master.inc:
Adding order by clauses in missing places
into gleb.loc:/home/uchum/work/bk/5.1-opt
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
mysql-test/Makefile.am:
Add install data for new test case
storage/ndb/tools/restore/Restore.cpp:
Convert blob(text) length stored in main table
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.2.Data:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.ctl:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.log:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.ctl:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.log:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.1.Data:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.ctl:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.log:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.ctl:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.log:
test data for endian test
mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result:
test result for endian test
mysql-test/suite/ndb/t/ndb_restore_different_endian_data.test:
test case for endian test
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
mysql-test/r/sp.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
into ibm.opbmk:/home/alik/Documents/MySQL/devel/5.1-rt-bug25843
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
of statement breaks binlog.
There were two problems discovered by this bug:
1. Default (current) database is not fixed at the creation time.
That leads to wrong output of DATABASE() function.
2. Database attributes (@@collation_database) are not fixed at
the creation time. That leads to wrong resultset.
Binlog breakage and Query Cache wrong output happened because of
the first problem.
The fix is to remember the current database at the PREPARE-time and
set it each time at EXECUTE.
mysql-test/include/query_cache_sql_prepare.inc:
The first part of the test case for BUG#25843.
mysql-test/r/query_cache_ps_no_prot.result:
Update result file.
mysql-test/r/query_cache_ps_ps_prot.result:
Update result file.
mysql-test/suite/rpl/r/rpl_ps.result:
Update result file.
mysql-test/suite/rpl/t/rpl_ps.test:
The second part of the test case for BUG#25843.
sql/mysql_priv.h:
Added mysql_opt_change_db() prototype.
sql/sp.cc:
1. Polishing;
2. sp_use_new_db() has been removed;
3. Use mysql_opt_change_db() instead of sp_use_new_db().
sql/sp.h:
sp_use_new_db() has been removed.
This function has nothing to do with a) sp and b) *new* database.
It was merely "switch the current database if needed".
sql/sp_head.cc:
1. Polishing.
2. Use mysql_opt_change_db() instead of sp_use_new_db().
sql/sql_class.cc:
Move THD::{db, db_length} into Statement.
sql/sql_class.h:
Move THD::{db, db_length} into Statement.
sql/sql_db.cc:
Introduce mysql_opt_change_db() as a replacement (and inspired by)
sp_use_new_db().
sql/sql_prepare.cc:
1. Remember the current database in Prepared_statement::prepare().
2. Switch/restore the current database in Prepared_statement::execute().
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
client/mysql.cc:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
mysql-test/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/tools/restore/Restore.cpp:
Auto merged
storage/ndb/tools/restore/restore_main.cpp:
Auto merged
mysql-test/suite/ndb/r/ndb_restore_compat.result:
Auto merged
mysql-test/suite/ndb/t/ndb_restore_compat.test:
Auto merged
into sita.local:/Users/tsmith/m/bk/maint/51
sql/field.cc:
Auto merged
sql/log_event_old.cc:
Auto merged
sql/rpl_record.h:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/slave.h:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
sql/log_event.cc:
Manual merge
sql/log_event.h:
Manual merge
sql/log_event_old.h:
Manual merge
sql/rpl_record.cc:
Manual merge
sql/slave.cc:
Manual merge
Bug#21422 GRANT/REVOKE possible inside stored function, probably in a trigger
Bug#17244 GRANT gives strange error message when used in a stored function
GRANT/REVOKE statements are non-transactional (no explicit transaction
boundaries) in nature and hence are forbidden inside stored functions and
triggers, but they weren't being effectively forbidden. Furthermore, the
absence of implict commits makes changes made by GRANT/REVOKE statements to
not be rolled back.
The implemented fix is to issue a implicit commit with every GRANT/REVOKE
statement, effectively prohibiting these statements in stored functions
and triggers. The implicit commit also fixes the replication bug, and looks
like being in concert with the behavior of DDL and administrative statements.
Since this is a incompatible change, the following sentence should be
added to the Manual in the very end of the 3rd paragraph, subclause
13.4.3 "Statements That Cause an Implicit Commit": "Beginning with
MySQL 5.0.??, the GRANT and REVOKE statements cause an implicit commit."
Patch contributed by Vladimir Shebordaev
mysql-test/r/sp-error.result:
Test case result for Bug#17244
mysql-test/t/sp-error.test:
Test case for Bug#17244
sql/sp_head.cc:
Set that a procedure with GRANT/REVOKE command has a (implicit or explicit)
commit.
sql/sql_parse.cc:
End active transaction in SQLCOM_GRANT and SQLCOM_REVOKE, and thus effectively
prohibit these statements in stored functions and triggers. An implicit commit
also fixes a bug in replication, when GRANT or REVOKE would disappear from the
binary log in case of a subsequent ROLLBACK, since they were considered
transactional statements.
mysql-test/suite/rpl/r/rpl_binlog_grant.result:
Add test case result for Bug#21975
mysql-test/suite/rpl/t/rpl_binlog_grant.test:
Add test case for Bug#21975
ChangeSet@1.2509, 2007-08-28
http://lists.mysql.com/commits/33239
Fixes for the funcs_1 datadict test bugs
#30418 "datadict" tests (all engines) fail:
Dependency on the host name for ordering
#30420 "datadict" tests (all engines) fail:
Release build has help tables loaded
#30438 "{memory,myisam,ndb}__datadict" tests fail:
Use "InnoDB" without checking
#30440 "datadict" tests (all engines) fail:
Character sets depend on
configuration
mysql-test/suite/funcs_1/README.txt:
Improved README
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
Additions for the NDB variant (currently not in use)
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
Write a comment about Bug#30689 into the test protocols.
mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
Fix for a not reported bug.
The missing revoke usage and drop user harmed the next test.
mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result:
Updated results
mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result:
Updated results
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Updated results
mysql-test/suite/funcs_1/r/memory__datadict.result:
Updated results
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Updated results
mysql-test/suite/funcs_1/r/ndb__datadict.result:
Updated results as far as they could be corrected.
Attention:
This test failed even before the current bug fixes.
The updated expected results are now better than before,
but they do not prevent that the test fails.
It looks like one script is "damaged" and treats
this NDB test different than expected within the
file with expected results.
The functions ROW_COUNT/FOUND_ROWS are indeed not safe to be used in
statement based replication.
Added code to declare them as such and switch the statement they're in
to row based logging for mixed mode.
sql/item_create.cc:
Bug #30244: row_count/found_rows does not replicate well
- add the functions to the set of "unsafe functions"
for statement based replication
mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result:
BitKeeper file /home/kgeorge/mysql/work/B30244-5.1-opt/mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result
mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test:
BitKeeper file /home/kgeorge/mysql/work/B30244-5.1-opt/mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test
ChangeSet@1.2509, 2007-08-28
http://lists.mysql.com/commits/33239
Fixes for the funcs_1 datadict test bugs
#30418 "datadict" tests (all engines) fail:
Dependency on the host name for ordering
#30420 "datadict" tests (all engines) fail:
Release build has help tables loaded
#30438 "{memory,myisam,ndb}__datadict" tests fail:
Use "InnoDB" without checking
#30440 "datadict" tests (all engines) fail:
Character sets depend on
configuration
There are more post merge fixes needed.
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Post merge fix for
ChangeSet@1.2509, 2007-08-28
mysql-test/suite/funcs_1/r/memory__datadict.result:
Updated results
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Updated results
mysql-test/suite/funcs_1/t/ndb__datadict.test:
Adjusted script
into four.local.lan:/WORK2/merge/mysql-5.1-build-datadict
It is to be expected that a post merge fix is needed.
mysql-test/suite/funcs_1/README.txt:
Auto merged
mysql-test/suite/funcs_1/t/innodb__datadict.test:
Auto merged
mysql-test/suite/funcs_1/t/memory__datadict.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam__datadict.test:
Auto merged
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
Manual merge
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Manual merge
mysql-test/suite/funcs_1/r/memory__datadict.result:
Manual merge
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Manual merge
Bug#30418 "datadict" tests (all engines) fail: Dependency on the host name
for ordering
Bug#30420 "datadict" tests (all engines) fail: Release build has help tables loaded
Bug#30438 "{memory,myisam,ndb}__datadict" tests fail: Use "InnoDB" without checking
Bug#30440 "datadict" tests (all engines) fail: Character sets depend on configuration
Attention: Only the build team can check if Bug#30440 is really fixed.
mysql-test/suite/funcs_1/README.txt:
Update README
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
1. Exclude the help tables from the INFORMATION_SCHEMA.TABLES
and the INFORMATION_SCHEMA.STATISTICS selects.
2. Replace error numbers with error names
3. Sort some results with mysqltest builtin function
4. Some other minor changes
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Updated expected results
mysql-test/suite/funcs_1/r/memory__datadict.result:
Updated expected results
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Updated expected results
mysql-test/suite/funcs_1/t/innodb__datadict.test:
Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.
mysql-test/suite/funcs_1/t/memory__datadict.test:
Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.
mysql-test/suite/funcs_1/t/myisam__datadict.test:
Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.
mysql-test/suite/funcs_1/r/datadict_help_tables_build.result:
File with expected results
mysql-test/suite/funcs_1/r/datadict_help_tables_dev.result:
File with expected results
mysql-test/suite/funcs_1/t/datadict_help_tables_build.test:
Additional test checking the information about the help tables within
INFORMATION_SCHEMA.TABLES/INFORMATION_SCHEMA.STATISTICS
as compensation for the removed checks within datadict_master.inc.
Variant for use during build tests (non empty help tables)
mysql-test/suite/funcs_1/t/datadict_help_tables_dev.test:
Additional test checking the information about the help tables within
INFORMATION_SCHEMA.TABLES/INFORMATION_SCHEMA.STATISTICS
as compensation for the removed checks within datadict_master.inc.
Variant for use during development tests (empty help tables)
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
mysql-test/suite/ndb/r/ndb_restore.result:
Auto merged
mysql-test/suite/ndb/t/ndb_restore.test:
Auto merged
sql/ha_ndbcluster.cc:
manual merge
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
extra/yassl/include/openssl/crypto.h:
Auto merged
extra/yassl/include/openssl/ssl.h:
Auto merged
extra/yassl/include/yassl_int.hpp:
Auto merged
extra/yassl/src/ssl.cpp:
Auto merged
extra/yassl/src/yassl_int.cpp:
Auto merged
vio/viossl.c:
Auto merged
mysql-test/suite/rpl/t/rpl_ssl.test:
Merge 5.0->5.1
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
sql/field.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
configure.in:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/partition_pruning.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/suite/rpl/include/rpl_mixed_ddl.inc:
Auto merged
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
Auto merged
mysql-test/suite/rpl/r/rpl_timezone.result:
Auto merged
mysql-test/suite/rpl/t/rpl_relayspace.test:
Auto merged
mysql-test/suite/rpl/t/rpl_timezone.test:
Auto merged
mysql-test/t/select.test:
Auto merged
netware/BUILD/compile-netware-END:
Auto merged
netware/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/time.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
storage/innobase/log/log0recv.c:
Auto merged
storage/innobase/srv/srv0srv.c:
Auto merged
storage/innobase/trx/trx0trx.c:
Auto merged
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
manual merge (use remote)
mysql-test/suite/rpl/t/disabled.def:
Manual merge - both rpl_innodb_mixed_ddl and rpl_innodb_mixed_dml
are fixed, and should be run as part of the rpl suite.
Update some tests in the "parts" suite, so they're skipped if the
requisite plugins are not present in the mysqld.
mysql-test/suite/parts/t/partition_char_innodb.test:
Skip if mysqld doesn't include InnoDB support
mysql-test/suite/parts/t/partition_datetime_innodb.test:
Skip if mysqld doesn't include InnoDB support
mysql-test/suite/parts/t/partition_decimal_innodb.test:
Skip if mysqld doesn't include InnoDB support
mysql-test/suite/parts/t/partition_float_innodb.test:
Skip if mysqld doesn't include InnoDB support
mysql-test/suite/parts/t/partition_int_innodb.test:
Skip if mysqld doesn't include InnoDB support
mysql-test/suite/parts/t/partition_special_innodb.test:
Skip if mysqld doesn't include InnoDB support
mysql-test/suite/parts/t/rpl_partition.test:
Skip if mysqld doesn't include partition support
Bug #30316: Some "parts" tests fail because the server uses "--secure-file-priv"
Bug #30341: Test suite "parts" needs to be adapted to the new rules disallowing many functio
Bug #30408: Suite "parts" needs bug numbers updated
Bug #30411: Suite "parts" needs bug numbers updated: ER_UNIQUE_KEY_NEED_ALL_FIELDS_IN_PF
Bug #30576: part_supported_sql_func_innodb.test tries to LOAD DATA outside of var dir
Bug #30581: partition_value tests use disallowed CAST() function
Included are some general fixes to allow the "parts" test suite to be run
successfully. This includes disabling a few tests or parts of tests,
cleaning up the test cases and their results, etc. Basically, these tests
have not been run for some time, and had suffered some bit rot.
The bugs were fixed as a single changeset, because in some ways they depend
on each other. I couldn't be sure I'd updated all the error codes (for
bugs 30408 and 30411) without also adapting to the new allowed functions
rules (bug 30341), and vice versa.
mysql-test/include/partition_layout.inc:
Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc:
Add ASCII(), ORD() and WEEKOFYEAR() as blocked functions (they depend
too much on character set, etc.).
Remove DATEDIFF() as a blocked function (it is implemented in terms
of TO_DAYS() and the minus operator).
mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc:
Remove ASCII(), ORD() and WEEKOFYEAR(), which are not allowed functions.
Remove uses of CAST() in partitioning functions - it is not allowed.
Disable testing of FLOOR() and CEILING on non-integer fields, due to
Bug 30577.
Test MOD() with an integer field instead of floating point (it has a
hybrid result type, like FLOOR() and CEILING(), but makes sense to use
with an integer field).
Add DATEDIFF() as an allowed function, because it is implemented in
terms of TO_DAYS() and the minus operator.
mysql-test/suite/parts/inc/partition_alter3.inc:
Remove use of disallowed CAST() function in partitioning
mysql-test/suite/parts/inc/partition_blocked_sql_funcs.inc:
The blocked functions are actually blocked now, so expect errors.
This is a result of the fix for bug 18198.
mysql-test/suite/parts/inc/partition_date.inc:
Remove uses of CAST() in partitioning functions - it is not allowed.
mysql-test/suite/parts/inc/partition_datetime.inc:
Remove uses of CAST() in partitioning functions - it is not allowed.
mysql-test/suite/parts/inc/partition_decimal.inc:
Remove uses of CAST() in partitioning functions - it is not allowed.
Disable testing of FLOOR() and CEILING(), due to Bug 30577.
mysql-test/suite/parts/inc/partition_directory.inc:
Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
mysql-test/suite/parts/inc/partition_double.inc:
Remove uses of CAST() in partitioning functions - it is not allowed.
Disable testing of FLOOR() and CEILING(), due to Bug 30577.
mysql-test/suite/parts/inc/partition_enum.inc:
Remove use of CAST(), which is disallowed.
Remove test which relies on CAST().
mysql-test/suite/parts/inc/partition_float.inc:
Remove uses of CAST() in partitioning functions - it is not allowed.
Disable testing of FLOOR() and CEILING(), due to Bug 30577.
mysql-test/suite/parts/inc/partition_layout_check1.inc:
Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
mysql-test/suite/parts/inc/partition_layout_check2.inc:
Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
mysql-test/suite/parts/inc/partition_methods1.inc:
Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
mysql-test/suite/parts/inc/partition_set.inc:
Remove test which relies on CAST(), which is disallowed.
mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc:
Fix Bug #30576: part_supported_sql_func_innodb.test tries to LOAD DATA outside of var dir
Move data files into std_data/parts/*, so they can be used with LOAD
DATA INFILE '../std_data_ln/parts/*' while --secure-file-priv is in
force.
mysql-test/suite/parts/inc/partition_syntax.inc:
Remove use of CAST(), which is disallowed.
mysql-test/suite/parts/inc/partition_time.inc:
Remove use of CAST(), which is disallowed.
mysql-test/suite/parts/inc/partition_timestamp.inc:
Remove use of CAST(), which is disallowed.
mysql-test/suite/parts/inc/partition_value.inc:
Disable this entire test file, because it relies on using CAST() as
a partitioning function, which is disallowed. See Bug 30581,
"partition_value tests use disallowed CAST() function".
mysql-test/suite/parts/r/part_blocked_sql_func_innodb.result:
Update test case results
mysql-test/suite/parts/r/part_blocked_sql_func_myisam.result:
Update test case results
mysql-test/suite/parts/r/part_supported_sql_func_innodb.result:
Update test case results
mysql-test/suite/parts/r/part_supported_sql_func_myisam.result:
Update test case results
mysql-test/suite/parts/r/partition_alter3_innodb.result:
Update test case results
mysql-test/suite/parts/r/partition_alter3_myisam.result:
Update test case results
mysql-test/suite/parts/r/partition_basic_innodb.result:
Update test case results
mysql-test/suite/parts/r/partition_basic_myisam.result:
Update test case results
mysql-test/suite/parts/r/partition_datetime_innodb.result:
Update test case results
mysql-test/suite/parts/r/partition_datetime_myisam.result:
Update test case results
mysql-test/suite/parts/r/partition_decimal_innodb.result:
Update test case results
mysql-test/suite/parts/r/partition_decimal_myisam.result:
Update test case results
mysql-test/suite/parts/r/partition_float_myisam.result:
Update test case results
mysql-test/suite/parts/r/partition_syntax_innodb.result:
Update test case results
mysql-test/suite/parts/r/partition_syntax_myisam.result:
Update test case results
mysql-test/suite/parts/t/disabled.def:
Mark several more tests as disabled: partition_value_myisam,
partition_value_innodb, part_supported_sql_func_ndb,
rpl_ndb_dd_partitions, and partition_float_innodb
mysql-test/std_data/parts/part_supported_sql_funcs_int_ch1.inc:
Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_ch1.inc
mysql-test/std_data/parts/part_supported_sql_funcs_int_date.inc:
Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_date.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_date.inc
mysql-test/std_data/parts/part_supported_sql_funcs_int_float.inc:
Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_float.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_float.inc
mysql-test/std_data/parts/part_supported_sql_funcs_int_int.inc:
Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_int.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_int.inc
mysql-test/std_data/parts/part_supported_sql_funcs_int_time.inc:
Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_time.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_time.inc
mysql-test/suite/parts/inc/partition_alter_1.inc:
Correct expected error codes, which changed due to bug 29245.
mysql-test/suite/parts/inc/partition_check.inc:
Correct expected error codes, which changed due to bug 29245.
mysql-test/suite/parts/inc/partition_syntax_1.inc:
Correct expected error codes, which changed due to bug 29245.
Bug#29020 Event results not correctly replicated to slave in RBR: partially.
mysql-test/suite/rpl/r/rpl_invoked_features.result:
Updated result file.
mysql-test/suite/rpl/t/disabled.def:
removed test cases: rpl_invoked_features and rpl_innodb_mixed_* (alreade were commented out)
mysql-test/suite/rpl/t/rpl_invoked_features.test:
Added comments, implemented the waiting via include/wait_condition, minor fixes.
sql/field.cc:
- always pack in little endian, irrespective of starage engine native format
- always unpack as if it is atored in little endian, and unpack it to storage engine native format
into quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-rpl
mysql-test/suite/ndb/r/ndb_dd_basic.result:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event_old.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/rpl_record.h:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/unireg.h:
Auto merged
sql/log_event.cc:
Manual merge.
sql/log_event.h:
Manual merge.
sql/log_event_old.h:
Manual merge.
MySQL replicates the time zone only when operations that involve
it are performed. This is controlled by a flag. But this flag
is set only on successful operation.
The flag must be set also when there is an error that involves
a timezone (so the master would replicate the error to the slaves).
mysql-test/suite/rpl/r/rpl_timezone.result:
repush of Bug 29536 for 5.1.22 tree: test case
mysql-test/suite/rpl/t/rpl_timezone.test:
repush of Bug 29536 for 5.1.22 tree: test case
sql/field.cc:
re-push of Bug 29536 for 5.1.22: move setting of the flag before the operation
(so it apples to errors as well).
sql/time.cc:
re-push of Bug 29536 for 5.1.22: move setting of the flag before the operation
(so it apples to errors as well).
A test case was waiting for a fixed number of seconds for a specific
state of the slave IO thread to take place.
Fixed by waiting in a loop for that specific thread state instead
(or timeout).
mysql-test/suite/rpl/t/rpl_relayspace.test:
recommit of Bug 25228 for 5.1.22: fixed test case
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/rpl_rli.h:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
sql/log_event.cc:
- Initialization of new Rows_log_event members.
- Fixing some typos in documentation.
In Rows_log_event::do_apply_event:
- Set COMPLETE_ROWS_F flag (when master and slave have the same number of
columns and all colums are present in the row)
- Move initialization of tables write/read sets here, outside the rows
processing loop (and out of unpack_row() function).
- Remove calls to do_prepare_row() - no longer needed.
- Add code managing m_curr_row and m_curr_row_end pointers.
- Change signatures of row processing methods of Rows_log_event and it
descendants - now most arguments are taken from class members.
- Remove do_prepare_row() methods which are no longer used.
- The auto_afree_ptr template is moved to rpl_utility.h (so that it can
be used in log_event_old.cc).
- Removed copy_extra_fields() function - no longer used.
In Rows_log_event::write_row (former replace_record):
- The old code is moved to log_event_old.cc.
- Use prepare_record() and non-destructive unpack_current_row() to fill record
with data.
- In case a record being inserted already exists on slave and row data is
incomplete use the record found and non-destructive unpack_current_row() to
combine new column values with existing ones.
- More debug info added.
In Rows_log_event::find_row (former find_and_fetch_row function):
- The old code is moved to log_event_old.cc.
- Unpacking of the row is moved here.
- In case of search using PK, the key data is prepared here.
- More debug info added.
- Remove initialization of Rows_log_event::m_after_image buffer which is no
longer used.
- Use new row unpacking methods in Update_rows_log_event::do_exec_row() to
create before and after image.
Note: all existing code used by Rows_log_event::do_apply_event() has been moved
to log_event_old.cc to be used by *_rows_log_event_old classes.
sql/log_event.h:
- Add new COMPLETE_ROWS_F flag in Rows_log_event.
- Add Rows_log_event members describing the row being processed.
- Add a pointer to key buffer which is used in derived classes.
- Add new methods: find__row(), write_row() and unpack_current_row().
- Change signatures of do_...() methods (replace method arguments by
class members).
- Remove do_prepare_row() method which is no longer used.
- Update method documentation.
- Add Old_rows_log_event class, which contains the old row processing code, as
a friend of Rows_log_event so that it can access all members of an event
instance.
sql/log_event_old.cc:
Move here old implementation of Rows_log_event::do_apply_event() and
helper methods.
sql/log_event_old.h:
- Define new class Old_rows_log_event encapsulating old version of
Rows_log_event::do_apply_event() and the helper methods.
- Add the Old_rows_log_event class as a base for *_old versions of RBR event
classes, ensure that the old version of do_apply_event() is called.
- For *_old classes, declare the helper methods used in the old version of
do_apply_event().
sql/rpl_record.cc:
- Make unpack_row non-destructive for columns not present in the row.
- Don't fill read/write set here as it is done outside these functions.
- Move initialization of a record with default values to a separate
function prepare_record().
sql/rpl_record.h:
- Change signature of unpack_row().
- Declare function prepare_record().
sql/rpl_utility.cc:
Make tabe_def::calc_field_size() a const method.
sql/rpl_utility.h:
Make table_def::calc_field_size() a const method.
Move auto_afree_ptr template here so that it can be re-used (currently
in log_event.cc and log_event_old.cc). Similar with DBUG_PRINT_BITSET
macro.
mysql-test/extra/rpl_tests/rpl_ndb_2multi_basic.test:
Modification of rpl_ndb_2multi_eng test. Tests with partitioned tables
are removed and a setup with slave having different number of columns
than master is added.
mysql-test/include/rpl_multi_engine2.inc:
Modification of rpl_multi_engine3.inc which operates on more rows and
replaces "DELETE FROM t1" with "TRUNCATE TABLE t1" as the first form
doesn't replicate in NDB -> non-NDB setting (BUG#28538).
mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result:
Results of the test.
mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt:
Test options. --log-slave-updates=0 is compulsory as otherwise non-NDB
slave applying row events from NDB master will fail when trying to log
them.
mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test:
Test replication of NDB table to slave using other engine. The main test
is in extra/rpl_tests/rpl_ndb_2multi_basic.test. It is included here
several times with different settings of default storage engine on slave.
mysql-test/suite/rpl/include/rpl_mixed_ddl.inc:
updated main test for DDL
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
updated main test for DML
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
updated result file
mysql-test/suite/rpl/t/disabled.def:
updated disabled.def
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
sql/field.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/set_var.cc:
Auto merged
into trift2.:/MySQL/M51/push-5.1
Includes manual merges.
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/suite/ndb/r/ndb_dd_basic.result:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event_old.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/unireg.h:
Auto merged
mysql-test/r/status.result:
Manual merge of two incompatible fixes to test "status".
mysql-test/t/status.test:
Manual merge of two incompatible fixes to test "status".
sql/log_event.cc:
Manual merge.
sql/log_event.h:
Manual merge.
Updated test case to correst inconsistant results on different OS per #bug30559
mysql-test/suite/ndb/t/ndb_dd_ddl.test:
Updated test case to correst inconsistant results on different OS per #bug30559
mysql-test/suite/ndb/r/ndb_dd_ddl.result:
Updated test case to correst inconsistant results on different OS per #bug30559
uncommented the test case stated in bug18856 and commiting to mysql-5.1-target-5.1.22 clone per Tomas
mysql-test/suite/ndb/t/ndb_dd_dump.test:
uncommented the test case stated in bug18856 and commiting to mysql-5.1-target-5.1.22 clone per Tomas
mysql-test/suite/ndb/r/ndb_dd_dump.result:
uncommented the test case stated in bug18856 and commiting to mysql-5.1-target-5.1.22 clone per Tomas
mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
Auto merged
mysql-test/suite/ndb/r/ndb_read_multi_range.result:
Auto merged
mysql-test/suite/ndb/t/ndb_read_multi_range.test:
Auto merged
mysql-test/suite/rpl/r/rpl_row_max_relay_size.result:
Auto merged
mysql-test/suite/rpl/t/rpl_row_create_table.test:
Auto merged
mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test:
Auto merged
mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/rpl_rli.h:
Auto merged
BitKeeper/deleted/.del-rpl_extraMaster_Col.test:
Delete: mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
removed file_id,block_len from SHOW BINLOG EVENTS
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
updated result file
Fixed failing func_misc test for embedded server
Added casts to avoid compiler warnings
Removed Table_locks_immediate as it's depending on log file cacheing
Changed type of get_time() to avoid warnings
Removed testing if purger master logs succeded as this is not deterministic
libmysqld/lib_sql.cc:
Fixed failing func_misc test for embedded server
mysql-test/mysql-test-run.pl:
Shut first down slaves, then masters.
This should avoid some errors in the log file about not being able to connect to master during shutdown
mysql-test/r/func_misc.result:
Move DROP TABLE's first
mysql-test/r/status.result:
Removed Table_locks_immediate as it's depending on log file cacheing
mysql-test/suite/ndb/r/ndb_binlog_basic.result:
Removed testing if purger master logs succeded as this is not deterministic
mysql-test/suite/ndb/t/ndb_binlog_basic.test:
Removed testing if purger master logs succeded as this is not deterministic
mysql-test/t/func_misc.test:
Move DROP TABLE's first
mysql-test/t/status.test:
Removed Table_locks_immediate as it's depending on log file cacheing
sql/log_event.cc:
Added cast to avoid warnings
sql/log_event.h:
Changed type of get_time() to avoid warnings
WL#3982 Test information_schema.processlist
and replaces the corresponding tests pushed to
mysql-test-extra-5.1/mysql-test/qa-suite/info_schema
mysql-test/suite/funcs_1/datadict/datadict_priv.inc:
Auxiliary script
mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
Test of privileges
mysql-test/suite/funcs_1/datadict/processlist_val.inc:
Test of values
mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result:
Expected results
mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result:
Expected results
mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result:
Expected results
mysql-test/suite/funcs_1/r/b_processlist_val_ps.result:
Expected results
mysql-test/suite/funcs_1/t/a_processlist_priv_no_prot.test:
Test of privileges - variant without ps/sp/cursor/view-protocol
mysql-test/suite/funcs_1/t/a_processlist_val_no_prot.test:
Test of values - variant without ps/sp/cursor/view-protocol
mysql-test/suite/funcs_1/t/b_processlist_priv_ps.test:
Test of privileges - variant with ps-protocol
mysql-test/suite/funcs_1/t/b_processlist_val_ps.test:
Test of values - variant with ps-protocol
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
Auto merged
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
Auto merged
sql/field.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/field.h:
Manual merge
including a small change to build_table_filename().
mysql-test/mysql-test-run.pl:
Remove unused bad merge bitrot code. This chunk of code is a repeat
copy of an earlier chunk, and should never have been here.
mysql-test/r/innodb.result:
Updates to allow innodb.test to be run with --embedded-server
mysql-test/suite/binlog/r/binlog_innodb.result:
Updates to allow innodb.test to be run with --embedded-server
mysql-test/suite/binlog/t/binlog_innodb.test:
Updates to allow innodb.test to be run with --embedded-server
mysql-test/t/innodb.test:
Updates to allow innodb.test to be run with --embedded-server
sql/sql_table.cc:
build_table_filename(): Don't add FN_ROOTDIR to mysql_data_home if
it's already there. This is done to make it easier to write tests
which check the output of various error messages, and work with
both the embedded server (mysql_data_home is full path, including
trailing FN_ROOTDIR) and normal server (mysql_data_home is just ".").
Changed patch to Mats suggestion from review. Patch is for Bug#30209
.del-wait_for_slave_running_off.inc:
Delete: mysql-test/include/wait_for_slave_running_off.inc
BitKeeper/deleted/.del-wait_for_slave_running_off.inc:
Delete: mysql-test/include/wait_for_slave_running_off.inc
mysql-test/suite/rpl/t/rpl_packet.test:
Changed patch to Mats suggestion
into gleb.loc:/home/uchum/work/bk/5.1-opt
sql/field.cc:
Auto merged
BitKeeper/deleted/.del-readme.txt~3:
Auto merged
sql/field.h:
Auto merged
sql/handler.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/unireg.h:
Auto merged
sql/sql_select.cc:
Merge with main tree.
into mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_22086
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
This patch adds functionality to row-based replication to ensure the
slave's column sizes are >= to that of the master.
It also includes some refactoring for the code from WL#3228.
mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
Removed commented out portion of test referenced in bug report. This
test supports the original request of the bug report.
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
New result file for additional test.
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
New result file for additional test.
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
New result file for additional test.
sql/field.cc:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
This patch refactors the additions made by this bug patch and those
made by WL#3228. The effort consolidates the large switches on type()
into functions within the field classes.
sql/field.h:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
This patch refactors the additions made by this bug patch and those
made by WL#3228. The effort consolidates the large switches on type()
into functions within the field classes.
sql/log_event.cc:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
This patch refactors the calc_field_size() method to use the new
methods implemented in the field classes. It also corrects comments
concerning how replication of field metadata works.
sql/log_event.h:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
This patch refactors out the calc_field_size() method into the method
save_field_metadata().
sql/rpl_utility.cc:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
This patch adds a method to check the size of the field on the master
using the field metadata from WL#3228. Each column is checked to ensure
the slave's column is >= to the master's column in size.
sql/rpl_utility.h:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
This patch changes the table_def class so that it records the size of
the metadata. This is a result of refactoring out the calc_field_size()
method into the method save_field_metadata(). Prevents access via
field_metadata(col) to unitialized memory when there is no metadata
transmitted from the master.
mysql-test/suite/rpl/r/rpl_row_colSize.result:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
New result file for additional test.
mysql-test/suite/rpl/t/rpl_row_colSize.test:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
Added a test file to test each variable type that relies on field
metadata from the master.
mysql-test/include/test_fieldsize.inc:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
Sub unit file to test each variable type that relies on field
metadata from the master.
Updated test to use new include function
wait_for_slave_running_off.inc:
Created new include to resolve the timing issue recorded by Bug#30209
rpl_events.inc:
The issue shown in Bug#30128 is that 'from er' shows up in a part of the test that it should not show up in. This event really is not created until later in the test, yet since the test runs row and then turns around and runs statement, I am guessing that the first run may not have cleaned up like it should, so I am adding a sync with master after the drop of table t1 to ensure that both master and slave are clean.
mysql-test/suite/rpl/t/rpl_packet.test:
Updated test to use new include function
mysql-test/include/wait_for_slave_running_off.inc:
Created new include to resolve the timing issue recorded by Bug#30209
mysql-test/include/rpl_events.inc:
The issue shown in Bug#30128 is that 'from er' shows up in a part of the test that it should not show up in. This event really is not created until later in the test, yet since the test runs row and then turns around and runs statement, I am guessing that the first run may not have cleaned up like it should, so I am adding a sync with master after the drop of table t1 to ensure that both master and slave are clean.
disable partition processing if we open frm file only
mysql-test/suite/ndb/r/ndb_dd_basic.result:
test result
mysql-test/suite/ndb/t/ndb_dd_basic.test:
test case
sql/table.cc:
disable partition processing if we open frm file only
Updared to 'views' test - forcing sort order
Updateds included masked results as a result of bug 30322
mysql-test/suite/funcs_1/include/ndb_tb2.inc:
Correction to test file creating an ndb table
mysql-test/suite/funcs_1/r/innodb_views.result:
Updated resut file - forcing order by
mysql-test/suite/funcs_1/r/memory_views.result:
Updated resut file - forcing order by
mysql-test/suite/funcs_1/r/myisam_views.result:
Updated resut file - forcing order by
mysql-test/suite/funcs_1/r/ndb_cursors.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_func_view.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_07.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_08.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_trig_03.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_trig_09.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_views.result:
updated result file
mysql-test/suite/funcs_1/views/views_master.inc:
updated test file - forcing sort order
mysql-test/suite/funcs_2/r/ndb_charset.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_func_view.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_trig_03e.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_views.result:
Updated result file
mysql-test/suite/funcs_1/r/memory__datadict.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_func_view.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_trig_03e.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_views.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_func_view.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_views.result:
Updated result file
mysql-test/suite/funcs_1/views/views_master.inc:
updated test file
into magare.gmz:/home/kgeorge/mysql/work/B29536-5.1-opt
sql/field.cc:
Auto merged
sql/time.cc:
Auto merged
mysql-test/suite/rpl/r/rpl_timezone.result:
Auto merged
mysql-test/suite/rpl/t/rpl_timezone.test:
Bug 29536 : merge 5.0-opt -> 5.1-opt
into olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-merge
mysql-test/include/read_many_rows.inc:
Auto merged
mysql-test/r/events_bugs.result:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/read_many_rows_innodb.result:
Auto merged
sql/handler.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_rcontext.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_class.h:
Manual merge.
storage/innobase/handler/ha_innodb.cc:
Manual merge.
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysys/charset.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
client/mysqldump.c:
table type compare is changed to case insensitive
mysql-test/r/information_schema.result:
test result
mysql-test/r/information_schema_db.result:
result fix
mysql-test/suite/ndb/r/ndb_alter_table.result:
result fix
mysql-test/suite/ndb/r/ndb_temporary.result:
result fix
mysql-test/t/information_schema.test:
test case
sql/ha_ndbcluster.cc:
char* variables are changed to LEX_STRING
sql/ha_ndbcluster.h:
char* variables are changed to LEX_STRING
sql/ha_ndbcluster_binlog.cc:
char* variables are changed to LEX_STRING
sql/handler.cc:
char* variables are changed to LEX_STRING
sql/handler.h:
char* variables are changed to LEX_STRING
sql/sql_base.cc:
Modified functions which are used during open table process
according to table opening method and requested_object.
sql/sql_select.cc:
Add support for I_S tables into select_describe() function
sql/sql_show.cc:
1. Added initialization of 'open_method' to 'st_field_info' structs.
2. Added initialization of 'i_s_requested_object' to 'ST_SCHEMA_TABLE' structs.
3. New function which calculates database name and table name values
from 'where' condition if it's possible
void get_lookup_field_values(THD *thd, COND *cond, TABLE_LIST *table,
LOOKUP_FIELD_VALUES *lookup_field_vals);
4. New function which set table open method
setup_table_open_method(TABLE_LIST *tables,
ST_SCHEMA_TABLE *schema_table,
enum enum_schema_tables schema_table_idx)
5. New function
int make_db_list(THD *thd, List<LEX_STRING> *files,
LOOKUP_FIELD_VALUES *lookup_field_vals,
bool *with_i_schema)
6. New function
int make_table_name_list(THD *thd, List<LEX_STRING> *files, LEX *lex,
LOOKUP_FIELD_VALUES *lookup_field_vals,
bool with_i_schema, LEX_STRING *db_name)
7. Modified 'get_all_tables' function according to new schema(see wl#3732).
sql/sql_show.h:
char* variables are changed to LEX_STRING
sql/table.cc:
Modified functions which are used during open table process
according to table opening method and requested_object.
sql/table.h:
1. added new constants(open_method)
#define SKIP_OPEN_TABLE 0
#define OPEN_FRM_ONLY 1
#define OPEN_FULL_TABLE 2
2. Added new field 'open_method' into struct st_field_info;
uint open_method;
3. Added new field into ST_SCHEMA_TABLE struct
uint i_s_requested_object; /* the object we need to open(TABLE | VIEW) */.
4. Added new field to TABLE_LIST struct.
uint i_s_requested_object;
This field is set from ST_SCHEMA_TABLE.i_s_requested_object
for processed table before opening.
5. Added new fields to TABLE_LIST struct, used for 'explain select' for I_S table
bool has_db_lookup_value;
bool has_table_lookup_value;
uint table_open_method;
sql/unireg.h:
added new constants
This patch corrects a problem found during testing on Solaris. The code
changes how length values are retrieved on big endian machines. The
patch allows the rpl_extraColmaster tests to run on these machines.
mysql-test/suite/rpl/r/rpl_row_create_table.result:
WL#3228 (NDB) : RBR using different table defs on slave/master
New result file with changes from merge of 5.1 main.
mysql-test/suite/rpl/t/disabled.def:
WL#3228 (NDB) : RBR using different table defs on slave/master
Disable the rpl_rwo_extraColmaster_ndb test (WL#3915) because the code
fails on Big Endian machines. See BUG#29549 for more details.
sql/field.cc:
WL#3228 (NDB) : RBR using different table defs on slave/master
This patch corrects a problem found during testing on Solaris. The code
changes how the store_length method processes requests for values on
big endian machines.
sql/field.h:
WL#3228 (NDB) : RBR using different table defs on slave/master
This patch corrects a problem found during testing on Solaris. The code
changes how the store_length method processes requests for values on
big endian machines. It also changes the get_packed_length() method to
use the endian-ness of the host in getting the length + packlength.
sql/rpl_record.cc:
WL#3228 (NDB) : RBR using different table defs on slave/master
This patch turns on the little endian switch (db_low_byte_first) in
order to ensure the values are unpack correctly from binlog as they
are stored in little endian format in binlog.
sql/rpl_utility.cc:
WL#3228 (NDB) : RBR using different table defs on slave/master
This patch corrects a problem found during testing on Solaris. The code
changes how the calculated field size method processes requests for
values on big endian machines.
into mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl-merge
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/log_event.cc:
Auto merged
mysql-test/suite/rpl/r/rpl_row_create_table.result:
Merge with 5.1 main.
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
mysql-test/r/show_check.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/show_check.test:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
Data file moved into var directory
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
updated result file
mysql-test/suite/rpl/t/disabled.def:
updated file disabled.def
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
Addendum to bug 27417: removed tests for another bug
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
Addendum to bug 27417: removed tests for another bug
mysql-test/suite/rpl/r/rpl_row_create_table.result:
Addendum to bug 27417: changes to non-transactional tables
should be logged even on rollback.
Corrective patch to fix test failures in pushbuild and add assertions
to help debug rpl_extraColmaster test failures.
mysql-test/extra/rpl_tests/rpl_row_tabledefs.test:
WL#3915 : (NDB) master's cols > slave
Change test to omit the port numbers in the result file.
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
WL#3915 : (NDB) master's cols > slave
Corrected result file.
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
WL#3915 : (NDB) master's cols > slave
Corrected result file.
sql/rpl_utility.cc:
WL#3915 : (NDB) master's cols > slave
Added assertions to assist in debugging.
Merge magare.gmz:/home/kgeorge/mysql/work/B27417-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B27417-5.1-opt
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
merge of bug 27471 from 5.0-opt to 5.1-opt
sql/log.cc:
merge of bug 27471 from 5.0-opt to 5.1-opt
sql/set_var.cc:
merge of bug 27471 from 5.0-opt to 5.1-opt
sql/sp_head.cc:
merge of bug 27471 from 5.0-opt to 5.1-opt
sql/sql_delete.cc:
merge of bug 27471 from 5.0-opt to 5.1-opt
sql/sql_insert.cc:
merge of bug 27471 from 5.0-opt to 5.1-opt
sql/sql_load.cc:
merge of bug 27471 from 5.0-opt to 5.1-opt
sql/sql_parse.cc:
merge of bug 27471 from 5.0-opt to 5.1-opt
sql/sql_update.cc:
merge of bug 27471 from 5.0-opt to 5.1-opt
Changed test to enable easier debugging.
mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
WL#3915 : (NDB) master's cols > slave
Changes to test in order to aide debugging.
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
WL#3915 : (NDB) master's cols > slave
New result file for test changes.
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
WL#3915 : (NDB) master's cols > slave
New result file for test changes.
mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result:
WL#3915 : (NDB) master's cols > slave
New result file for test changes.
into linux.site:/home/omer/source/jrg51
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
Auto merged
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_views.result:
Auto merged
mysql-test/suite/funcs_1/r/memory__datadict.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_08.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_09.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
Auto merged
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
Auto merged
mysql-test/suite/funcs_1/views/func_view.inc:
Auto merged
mysql-test/suite/funcs_1/r/innodb_func_view.result:
manual merge
mysql-test/suite/funcs_1/r/memory_func_view.result:
manual merge
mysql-test/suite/funcs_1/r/myisam_func_view.result:
manual merge
mysql-test/suite/funcs_1/r/myisam_views.result:
manual merge
This patch includes changes to result files for tests issuing BINLOG
queries. The values have changed due to a size difference in the
table map.
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
WL#3228 (NDB) : RBR using different table defs on slave/master
New results file for changes to binlog table map log event size.
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
WL#3228 (NDB) : RBR using different table defs on slave/master
New results file for changes to binlog table map log event size.
Fixing tests and results to work when replicating to fewer columns on
slave than on master. One test that previously should fail, now works,
and some log positions have changed as a result of adding metadata to
the events.
mysql-test/extra/rpl_tests/rpl_row_tabledefs.test:
Replication to fewer columns on slave now works.
mysql-test/include/wait_for_slave_to_stop.inc:
Adding subsitutions for SHOW SLAVE STATUS
mysql-test/suite/binlog/r/binlog_row_binlog.result:
Result change.
mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result:
Result change.
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Result change.
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Result change.
mysql-test/suite/rpl/r/rpl_slave_skip.result:
Result change.
mysql-test/suite/rpl/t/rpl_skip_error-slave.opt:
Error number changed [!]
This patch adds the ability to store extra field metadata in the table
map event. This data can include pack_length() or field_lenght() for
fields such as CHAR or VARCHAR enabling developers to add code that
can check for compatibilty between master and slave columns. More
importantly, the extra field metadata can be used to store data from the
master correctly should a VARCHAR field on the master be <= 255 bytes
while the same field on the slave is > 255 bytes.
The patch also includes the needed changes to unpack to ensure that data
which is smaller on the master can be unpacked correctly on the slave.
WL#3915 : (NDB) master's cols > slave
Slave starts accepting and handling rows of master's tables which have more columns.
The most important part of implementation is how to caclulate the amount of bytes to
skip for unknown by slave column.
mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
WL#3228 : RBR using different table defs on slave/master
This patch changes the test to coincide with changes to binlog
size of table map event.
mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result:
WL#3228 : RBR using different table defs on slave/master
This patch contains a new result file as a result of the change to the
size of the tablemap log event.
mysql-test/suite/rpl/r/rpl_row_create_table.result:
WL#3228 : RBR using different table defs on slave/master
This patch contains a new result file as a result of the change to the
size of the tablemap log event.
mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result:
WL#3228 : RBR using different table defs on slave/master
This patch contains a new result file as a result of the change to the
size of the tablemap log event.
mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result:
WL#3228 : RBR using different table defs on slave/master
This patch contains a new result file as a result of the change to the
size of the tablemap log event.
mysql-test/suite/rpl/r/rpl_row_log.result:
WL#3228 : RBR using different table defs on slave/master
This patch contains a new result file as a result of the change to the
size of the tablemap log event.
mysql-test/suite/rpl/r/rpl_row_log_innodb.result:
WL#3228 : RBR using different table defs on slave/master
This patch contains a new result file as a result of the change to the
size of the tablemap log event.
mysql-test/suite/rpl/r/rpl_row_max_relay_size.result:
WL#3228 : RBR using different table defs on slave/master
This patch contains a new result file as a result of the change to the
size of the tablemap log event.
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
WL#3228 : RBR using different table defs on slave/master
This patch contains a new result file as a result of the change to the
size of the tablemap log event.
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
WL#3228 : RBR using different table defs on slave/master
This patch contains a new result file as a result of the change to the
size of the tablemap log event.
mysql-test/suite/rpl/r/rpl_row_until.result:
WL#3228 : RBR using different table defs on slave/master
This patch contains a new result file as a result of the change to the
size of the tablemap log event.
mysql-test/suite/rpl/r/rpl_skip_error.result:
WL#3228 : RBR using different table defs on slave/master
This patch contains a new result file as a result of the change to the
size of the tablemap log event.
mysql-test/suite/rpl/t/disabled.def:
WL#3915 master's cols > slave
Disabled the rpl_stm_extraColmaster_ndb test because statement-based
replication is not supported in NDB at this time. It can be enabled
when statement-based replication for NDB is released.
mysql-test/suite/rpl/t/rpl_row_create_table.test:
WL#3228 : RBR using different table defs on slave/master
This patch corrects binlog positions a result of the change to the
size of the tablemap log event.
mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test:
WL#3228 : RBR using different table defs on slave/master
This patch corrects binlog positions a result of the change to the
size of the tablemap log event.
mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result:
WL#3228 : RBR using different table defs on slave/master
This patch contains a new result file as a result of the change to the
size of the tablemap log event.
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result:
WL#3228 : RBR using different table defs on slave/master
This patch contains a new result file as a result of the change to the
size of the tablemap log event.
sql/field.cc:
WL#3228 : RBR using different table defs on slave/master
This patch includes updates to the unpack() methods for the variable
length fields. A new parameter was added (from_length) that is the
value stored in the field_metadata of the table map from the table_def
class. If the value is non-zero and less than what the field on the
slave is then use the from_length else use the original value from the
field on the slave.
sql/field.h:
L#3228 : RBR using different table defs on slave/master
This patch includes updates to the unpack() methods for the variable
length fields. A new parameter was added (from_length) that is the
value stored in the field_metadata of the table map from the table_def
class.
sql/log_event.cc:
WL#3228 : RBR using different table defs on slave/master
This patch adds methods to calculate the field metadata size, prepare
the field metadata for writing to the binlog, and additions to the
Table_map_log_event::write_body method to include the field metadata
in the table map that is written to the binlog.
WL#3915 master's cols > slave
copying extra (slave's) fields returns early if master's table version is wider;
removing assert in the way of master > slave cols.
sql/log_event.h:
WL#3228 : RBR using different table defs on slave/master
This patch adds method declarations and variables needed to support
storing field metadata in the table map that is written to the binlog.
sql/rpl_record.cc:
WL#3228 : RBR using different table defs on slave/master
This patch modifies the unpack_row() method to unpack fields passing in
the value from the table_def class. This value is the extra field
metadata stored there from the master.
WL#3915 master's cols > slave
adding a snippet that shift exectution curson donw the row skipping unknown by slave
fields' data.
sql/rpl_rli.h:
WL#3228 : RBR using different table defs on slave/master
This patch adds a helper function to retrieve the table_def for a given
table in the RPL_TABLE_LIST structure.
sql/rpl_utility.cc:
WL#3228 : RBR using different table defs on slave/master
This patch adds a helper method that retrieves the correct size
parameter for the field. This method is used to compare the size as
sent by the master with that on the slave for all types of fields that
can vary in size and storage requirements.
WL#3915 master's cols > slave
Remove warning message for master's cols > slave.
sql/rpl_utility.h:
WL#3228 : RBR using different table defs on slave/master
This patch changes the table_def class constructor to pass in the raw
data read from the table map and extract it into an array of dimension
size (number of fields). It also adds a method to return the field
metadata for any field. The method returns the data stored in the table
map or 0 if no data was stored for that field. Lastly, a method to return
the results of field->maybe_null() is included so that the slave can
determine if a field that is not on the slave is null.
mysql-test/suite/rpl/t/rpl_colSize.test:
WL#3228 : RBR using different table defs on slave/master
This patch contains a new test designed to test the feature of having
columns on the master that are smaller than what is on the slave.
mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-master.opt:
WL#3915 master's cols > slave
option for innodb
mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-slave.opt:
WL#3915 master's cols > slave
option for innodb
mysql-test/suite/rpl/t/rpl_extraColmaster_innodb.test:
WL#3915 master's cols > slave
Test of innodb. Test runs in both statement- and row-based replication.
mysql-test/suite/rpl/t/rpl_extraColmaster_myisam.test:
WL#3915 master's cols > slave
Test of myisam. Test runs in both statement- and row-based replication.
mysql-test/suite/rpl/r/rpl_colSize.result:
WL#3228 : RBR using different table defs on slave/master
This patch contains a result file for the new test designed to test the
feature of having columns on the master that are smaller than what is
on the slave.
mysql-test/suite/rpl/t/rpl_row_extraColmaster_ndb.test:
WL#3915 master's cols > slave
Test of ndb. Test runs in row-based replication.
mysql-test/suite/rpl/t/rpl_stm_extraColmaster_ndb.test:
WL#3915 master's cols > slave
Test of ndb. Test runs in statement-based replication.
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
WL#3915 master's cols > slave
new results
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
WL#3915 master's cols > slave
new results
mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
WL#3915 master's cols > slave
basic tests checking altering and skipping extra fields by slave.
The fields can be of any possible types.
mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result:
WL#3915 master's cols > slave
new results
into mysql.com:/home/hf/work/29878/my51-29878
mysql-test/suite/rpl/r/rpl_session_var.result:
Auto merged
mysql-test/suite/rpl/t/rpl_session_var.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_strfunc.h:
Auto merged
Step 2:
Restore the 5.1 contents in the 5.0-dependent files.
mysql-test/suite/funcs_1/cursors/cursors_master.test:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/datadict/datadict_tables.inc:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_func_view.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_storedproc.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_views.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory__datadict.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_func_view.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_storedproc.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_03.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_08.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_09.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_views.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_func_view.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_storedproc.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_views.result:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_03.inc:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_08.inc:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_09.inc:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/views/func_view.inc:
Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/views/views_master.inc:
Restore the 5.1 contents in the 5.0-dependent file.
Removing a RESET MASTER inside the test since that will change binlog
positions in such a manner that the dual masters lose track of where
they acually are.
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result:
Result change.
mysql-test/suite/rpl_ndb/t/disabled.def:
Enabling test.
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test:
Removing a RESET MASTER since circular replication don't look kindly
on truncating binlogs.
- reset the logs before and after the test.
- cleanup from the previous tests : use the correct schema.
mysql-test/extra/rpl_tests/rpl_insert_delayed.test:
5.0-opt -> 5.1-opt merge of the test case for bug 29571.
mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result:
5.0-opt -> 5.1-opt merge of the test case for bug 29571.
into debian.(none):/M51/rowlock-5.1
BitKeeper/deleted/.del-readme.txt~3:
Merge rename: BitKeeper/deleted/.del-readme.txt -> BitKeeper/deleted/.del-readme.txt~3
Makefile.am:
Manual merge: "row_lock" suite is deleted.
Adding code to filter out slave SQL errors since these are checked by
the tests themselves.
mysql-test/lib/mtr_report.pl:
Filtering out slave SQL errors since these are handled by the
tests themselves.
mysql-test/suite/rpl/t/disabled.def:
Enabling disabled tests.
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result:
Result change.
mysql-test/suite/rpl_ndb/t/disabled.def:
Enabling disabled tests.
Stopping mysql server could result in an entry in mysql error
file: "InnoDB: Error: MySQL is freeing a thd".
This happened because InnoDB assumes that the server will never
call external_lock(F_UNLCK) in case external_lock(READ/WRITE)
failed.
Prior to this patch we haven't had strict definition whether
external_lock(F_UNLCK) must be called in case external_lock(READ/WRITE)
fails.
This patch states that we never call external_lock(F_UNLCK) in case
external_lock(READ/WRITE) fails.
mysql-test/suite/binlog/t/disabled.def:
Re-enabled binlog_innodb and binlog_killed tests.
sql/ha_ndbcluster.cc:
Restore handler state in case external_lock() failed.
sql/ha_partition.cc:
Do not call external_lock(F_UNLCK) in case external_lock(READ/WRITE) failed.
sql/lock.cc:
Do not call external_lock(F_UNLCK) in case external_lock(READ/WRITE) failed.
storage/myisammrg/myrg_locking.c:
Restore handler state in case external_lock() failed.
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team
include/my_bitmap.h:
Auto merged
mysql-test/suite/binlog/r/binlog_multi_engine.result:
Auto merged
mysql-test/suite/ndb/r/ndb_binlog_multi.result:
Auto merged
mysql-test/suite/ndb/t/ndb_autodiscover3.test:
Auto merged
mysql-test/suite/ndb/t/ndb_binlog_basic.test:
Auto merged
mysql-test/suite/ndb/t/ndb_binlog_ddl_multi.test:
Auto merged
mysql-test/suite/ndb/t/ndb_binlog_discover.test:
Auto merged
mysql-test/suite/ndb/t/ndb_binlog_ignore_db.test:
Auto merged
mysql-test/suite/ndb/t/ndb_binlog_log_bin.test:
Auto merged
mysql-test/suite/ndb/t/ndb_binlog_multi.test:
Auto merged
mysql-test/suite/ndb/t/ndb_multi_row.test:
Auto merged
mysql-test/suite/rpl/r/rpl_row_log.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_log_innodb.result:
Auto merged
mysql-test/suite/rpl/r/rpl_stm_log.result:
Auto merged
mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test:
Auto merged
sql/log_event.cc:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result:
Manual merge
mysql-test/t/disabled.def:
Manual merge of main tree into replication tree
Note datadict files do not include wrong is_updatable wrong value
as a result of bug 30020.
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
Updated test file
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Updated test file
mysql-test/suite/funcs_1/r/innodb_func_view.result:
Updated test file
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
Updated test file
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
Updated test file
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
Updated test file
mysql-test/suite/funcs_1/r/innodb_views.result:
Updated test file
mysql-test/suite/funcs_1/r/memory__datadict.result:
Updated test file
mysql-test/suite/funcs_1/r/memory_func_view.result:
Updated test file
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
Updated test file
mysql-test/suite/funcs_1/r/memory_trig_08.result:
Updated test file
mysql-test/suite/funcs_1/r/memory_trig_09.result:
Updated test file
mysql-test/suite/funcs_1/r/memory_views.result:
Updated test file
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Updated test file
mysql-test/suite/funcs_1/r/myisam_func_view.result:
Updated test file
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
Updated test file
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
Updated test file
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
Updated test file
mysql-test/suite/funcs_1/r/myisam_views.result:
Updated test file
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
Updated test file
mysql-test/suite/funcs_1/views/func_view.inc:
Updated test file
into mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
libmysql/libmysql.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
into gleb.loc:/home/uchum/work/bk/5.1-opt
mysql-test/t/disabled.def:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
SCCS merged
tests/mysql_client_test.c:
SCCS merged
into gleb.loc:/home/uchum/work/bk/5.1-opt
client/mysqldump.c:
Auto merged
include/my_base.h:
Auto merged
mysql-test/include/mix1.inc:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
into trift2.:/MySQL/M51/push-5.1
mysql-test/r/events_bugs.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
mysql-test/suite/rpl_ndb/t/disabled.def:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
Disabled test cases that produce errors in a "server log".
mysql-test/t/disabled.def:
Post-merge fixes
Removed 'binlog_innodb' from the wrong disabled.def file.
into trift-lap.fambruehe:/MySQL/M51/push-5.1
configure.in:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/events_bugs.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
Auto merged
sql/field.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
into chilla.local:/home/mydev/mysql-5.1-axmrg
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/suite/ndb/r/ndb_update.result:
Auto merged
mysql-test/suite/ndb/t/ndb_single_user.test:
Auto merged
mysql-test/suite/ndb/t/ndb_update.test:
Auto merged
mysql-test/suite/parts/r/rpl_partition.result:
Auto merged
mysql-test/suite/parts/t/rpl_partition.test:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
Auto merged
into olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-merge
mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result:
Auto merged
mysql-test/t/disabled.def:
SCCS merged
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
mysql-test/suite/ndb/t/ndb_multi.test:
Auto merged
mysql-test/suite/ndb/t/ndb_multi_row.test:
Auto merged
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Auto merged
into sita.local:/Users/tsmith/m/bk/maint/51
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Auto merged
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/log_event.cc:
manual merge
into sita.local:/Users/tsmith/m/bk/maint/51
This merge requires a post-merge fix to remove rpl_udf from
suite/rpl/t/disabled.def.
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/suite/ndb/r/ndb_dd_basic.result:
Auto merged
mysql-test/suite/ndb/r/ndb_dd_ddl.result:
Auto merged
mysql-test/suite/ndb/r/ndb_gis.result:
Auto merged
mysql-test/suite/ndb/r/ndb_row_format.result:
Auto merged
mysql-test/suite/ndb/r/ndb_single_user.result:
Auto merged
mysql-test/suite/ndb/t/ndb_single_user.test:
Auto merged
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
Auto merged
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_incident.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_show.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
mysql-test/r/csv.result:
Manual merge
mysql-test/t/csv.test:
Manual merge
mysql-test/t/disabled.def:
Manual merge
into mysql.com:/home/ram/work/b29420/b29420.5.1
sql/sql_repl.cc:
Auto merged
mysql-test/suite/rpl/r/rpl_rotate_logs.result:
Auto merged
mysql-test/suite/rpl/t/rpl_rotate_logs.test:
Auto merged
Update the disabled.def files to reflect actual contents of the t/* directories.
Also, move a few more tests into suite/*.
mysql-test/suite/parts/t/rpl_partition.test:
Rename: mysql-test/t/rpl_partition.test -> mysql-test/suite/parts/t/rpl_partition.test
mysql-test/suite/parts/r/rpl_partition.result:
Rename: mysql-test/r/rpl_partition.result -> mysql-test/suite/parts/r/rpl_partition.result
mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt:
Rename: mysql-test/t/rpl_ndb_ctype_ucs2_def-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test:
Rename: mysql-test/t/rpl_ndb_ctype_ucs2_def.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb-master.opt:
Rename: mysql-test/t/rpl_ndb_mix_innodb-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test:
Rename: mysql-test/t/rpl_ndb_mix_innodb.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test
mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result:
Rename: mysql-test/r/rpl_ndb_ctype_ucs2_def.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_innodb.result:
Rename: mysql-test/r/rpl_ndb_mix_innodb.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_innodb.result
mysql-test/suite/ndb/t/disabled.def:
Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.
mysql-test/suite/parts/t/disabled.def:
Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.
mysql-test/suite/rpl/t/disabled.def:
Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.
mysql-test/suite/rpl_ndb/t/disabled.def:
Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.
mysql-test/t/disabled.def:
Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
client/mysqldump.c:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/suite/binlog/r/binlog_multi_engine.result:
Auto merged
mysql-test/suite/binlog/t/binlog_multi_engine.test:
Auto merged
mysql-test/suite/ndb/r/ndb_read_multi_range.result:
Auto merged
mysql-test/suite/ndb/r/ndb_sp.result:
Auto merged
mysql-test/suite/ndb/r/ndb_trigger.result:
Auto merged
mysql-test/suite/ndb/r/ps_7ndb.result:
Auto merged
mysql-test/suite/ndb/t/loaddata_autocom_ndb.test:
Auto merged
mysql-test/suite/ndb/t/ndb_alter_table.test:
Auto merged
mysql-test/suite/ndb/t/ndb_alter_table2.test:
Auto merged
mysql-test/suite/ndb/t/ndb_alter_table3.test:
Auto merged
mysql-test/suite/ndb/t/ndb_autodiscover.test:
Auto merged
mysql-test/suite/ndb/t/ndb_autodiscover2.test:
Auto merged
mysql-test/suite/ndb/t/ndb_autodiscover3.test:
Auto merged
mysql-test/suite/ndb/t/ndb_basic.test:
Auto merged
mysql-test/suite/ndb/t/ndb_binlog_ddl_multi.test:
Auto merged
mysql-test/suite/ndb/t/ndb_binlog_log_bin.test:
Auto merged
mysql-test/suite/ndb/t/ndb_binlog_multi.test:
Auto merged
mysql-test/suite/ndb/t/ndb_bitfield.test:
Auto merged
mysql-test/suite/ndb/t/ndb_blob.test:
Auto merged
mysql-test/suite/ndb/t/ndb_blob_partition.test:
Auto merged
mysql-test/suite/ndb/t/ndb_cache.test:
Auto merged
mysql-test/suite/ndb/t/ndb_cache2.test:
Auto merged
mysql-test/suite/ndb/t/ndb_cache_multi.test:
Auto merged
mysql-test/suite/ndb/t/ndb_cache_multi2.test:
Auto merged
mysql-test/suite/ndb/t/ndb_charset.test:
Auto merged
mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
Auto merged
mysql-test/suite/ndb/t/ndb_config.test:
Auto merged
mysql-test/suite/ndb/t/ndb_config2.test:
Auto merged
mysql-test/suite/ndb/t/ndb_cursor.test:
Auto merged
mysql-test/suite/ndb/t/ndb_database.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_alter.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_backuprestore.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_basic.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_ddl.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_disk2memory.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_dump.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_sql_features.test:
Auto merged
mysql-test/suite/ndb/t/ndb_gis.test:
Auto merged
mysql-test/suite/ndb/t/ndb_index.test:
Auto merged
mysql-test/suite/ndb/t/ndb_index_ordered.test:
Auto merged
mysql-test/suite/ndb/t/ndb_index_unique.test:
Auto merged
mysql-test/suite/ndb/t/ndb_insert.test:
Auto merged
mysql-test/suite/ndb/t/ndb_limit.test:
Auto merged
mysql-test/suite/ndb/t/ndb_loaddatalocal.test:
Auto merged
mysql-test/suite/ndb/t/ndb_lock.test:
Auto merged
mysql-test/suite/ndb/t/ndb_minmax.test:
Auto merged
mysql-test/suite/ndb/t/ndb_multi.test:
Auto merged
mysql-test/suite/ndb/t/ndb_partition_error.test:
Auto merged
mysql-test/suite/ndb/t/ndb_partition_key.test:
Auto merged
mysql-test/suite/ndb/t/ndb_partition_list.test:
Auto merged
mysql-test/suite/ndb/t/ndb_partition_range.test:
Auto merged
mysql-test/suite/ndb/t/ndb_read_multi_range.test:
Auto merged
mysql-test/suite/ndb/t/ndb_rename.test:
Auto merged
mysql-test/suite/ndb/t/ndb_replace.test:
Auto merged
mysql-test/suite/ndb/t/ndb_restore.test:
Auto merged
mysql-test/suite/ndb/t/ndb_restore_partition.test:
Auto merged
mysql-test/suite/ndb/t/ndb_restore_print.test:
Auto merged
mysql-test/suite/ndb/t/ndb_row_format.test:
Auto merged
mysql-test/suite/ndb/t/ndb_single_user.test:
Auto merged
mysql-test/suite/ndb/t/ndb_sp.test:
Auto merged
mysql-test/suite/ndb/t/ndb_subquery.test:
Auto merged
mysql-test/suite/ndb/t/ndb_temporary.test:
Auto merged
mysql-test/suite/ndb/t/ndb_transaction.test:
Auto merged
mysql-test/suite/ndb/t/ndb_trigger.test:
Auto merged
mysql-test/suite/ndb/t/ndb_truncate.test:
Auto merged
mysql-test/suite/ndb/t/ndb_types.test:
Auto merged
mysql-test/suite/ndb/t/ndb_update.test:
Auto merged
mysql-test/suite/ndb/t/ndb_view.test:
Auto merged
mysql-test/suite/ndb/t/ndbapi.test:
Auto merged
mysql-test/suite/ndb/t/ps_7ndb.test:
Auto merged
mysql-test/suite/ndb/t/strict_autoinc_5ndb.test:
Auto merged
mysql-test/suite/rpl/r/rpl_events.result:
Auto merged
mysql-test/suite/rpl/r/rpl_replicate_do.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_UUID.result:
Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
Auto merged
mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result:
Auto merged
mysql-test/suite/rpl/r/rpl_trigger.result:
Auto merged
mysql-test/suite/rpl/r/rpl_view.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/t/disabled.def:
manual merge
(Will need to follow up with moving a few test cases around post-merge)
Remove indeterministic behavior from a test
mysql-test/suite/rpl/r/rpl_misc_functions.result:
Remove indeterministic behavior from a test
mysql-test/suite/rpl/t/rpl_misc_functions.test:
Remove indeterministic behavior from a test
work around bug 29537, which was revealed by patch for bug 28356: move DROP TABLE before DROP PROCEDURE in cleanup
mysql-test/suite/rpl/r/rpl_misc_functions.result:
work around bug 29537, which was revealed by patch for bug 28356: move DROP TABLE before DROP PROCEDURE in cleanup
mysql-test/suite/rpl/t/rpl_misc_functions.test:
work around bug 29537, which was revealed by patch for bug 28356: move DROP TABLE before DROP PROCEDURE in cleanup
minor fixes to appease pushbuild.
---
Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
into sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
mysql-test/extra/binlog_tests/binlog.test:
Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
make test portable so it will work on servers with
funny names.
mysql-test/suite/binlog/r/binlog_row_binlog.result:
Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
make test portable so it will work on servers with
funny names.
mysql-test/suite/binlog/r/binlog_stm_binlog.result:
Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
make test portable so it will work on servers with
funny names.
into sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
mysql-test/suite/binlog/r/binlog_row_binlog.result:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_binlog.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_create_table.result:
Auto merged
mysql-test/suite/rpl/include/rpl_mixed_ddl.inc:
removed Server version from SHOW BINLOG EVENTS
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
removed Server version from SHOW BINLOG EVENTS
mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result:
updated result file
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
updated result file
mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test:
skip test for row/statement
mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test:
skip test for row/statement
- Update test results for --binlog-format=row
mysql-test/suite/binlog/r/binlog_row_binlog.result:
Update test result
mysql-test/suite/rpl/r/rpl_row_create_table.result:
Update test result
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_binlog.result:
Auto merged
mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
Auto merged
mysql-test/suite/ndb/r/ndb_backup_print.result:
Auto merged
mysql-test/suite/ndb/t/loaddata_autocom_ndb.test:
Auto merged
mysql-test/suite/ndb/t/ndb_alter_table.test:
Auto merged
mysql-test/suite/ndb/t/ndb_alter_table2.test:
Auto merged
mysql-test/suite/ndb/t/ndb_alter_table3.test:
Auto merged
mysql-test/suite/ndb/t/ndb_autodiscover.test:
Auto merged
mysql-test/suite/ndb/t/ndb_autodiscover2.test:
Auto merged
mysql-test/suite/ndb/t/ndb_autodiscover3.test:
Auto merged
mysql-test/suite/ndb/t/ndb_backup_print.test:
Auto merged
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
Auto merged
mysql-test/suite/ndb/t/ndb_basic.test:
Auto merged
mysql-test/suite/ndb/t/ndb_binlog_log_bin.test:
Auto merged
mysql-test/suite/ndb/t/ndb_binlog_multi.test:
Auto merged
mysql-test/suite/ndb/t/ndb_bitfield.test:
Auto merged
mysql-test/suite/ndb/t/ndb_blob.test:
Auto merged
mysql-test/suite/ndb/t/ndb_blob_partition.test:
Auto merged
mysql-test/suite/ndb/t/ndb_cache.test:
Auto merged
mysql-test/suite/ndb/t/ndb_cache2.test:
Auto merged
mysql-test/suite/ndb/t/ndb_cache_multi.test:
Auto merged
mysql-test/suite/ndb/t/ndb_cache_multi2.test:
Auto merged
mysql-test/suite/ndb/t/ndb_charset.test:
Auto merged
mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
Auto merged
mysql-test/suite/ndb/t/ndb_config.test:
Auto merged
mysql-test/suite/ndb/t/ndb_config2.test:
Auto merged
mysql-test/suite/ndb/t/ndb_cursor.test:
Auto merged
mysql-test/suite/ndb/t/ndb_database.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_alter.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_backuprestore.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_basic.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_ddl.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_disk2memory.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_dump.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_sql_features.test:
Auto merged
mysql-test/suite/ndb/t/ndb_gis.test:
Auto merged
mysql-test/suite/ndb/t/ndb_index.test:
Auto merged
mysql-test/suite/ndb/t/ndb_index_ordered.test:
Auto merged
mysql-test/suite/ndb/t/ndb_index_unique.test:
Auto merged
mysql-test/suite/ndb/t/ndb_insert.test:
Auto merged
mysql-test/suite/ndb/t/ndb_limit.test:
Auto merged
mysql-test/suite/ndb/t/ndb_loaddatalocal.test:
Auto merged
mysql-test/suite/ndb/t/ndb_lock.test:
Auto merged
mysql-test/suite/ndb/t/ndb_minmax.test:
Auto merged
mysql-test/suite/ndb/t/ndb_multi.test:
Auto merged
mysql-test/suite/ndb/t/ndb_partition_error.test:
Auto merged
mysql-test/suite/ndb/t/ndb_partition_key.test:
Auto merged
mysql-test/suite/ndb/t/ndb_partition_list.test:
Auto merged
mysql-test/suite/ndb/t/ndb_partition_range.test:
Auto merged
mysql-test/suite/ndb/t/ndb_read_multi_range.test:
Auto merged
mysql-test/suite/ndb/t/ndb_rename.test:
Auto merged
mysql-test/suite/ndb/t/ndb_replace.test:
Auto merged
mysql-test/suite/ndb/t/ndb_restore.test:
Auto merged
mysql-test/suite/ndb/t/ndb_restore_partition.test:
Auto merged
mysql-test/suite/ndb/t/ndb_restore_print.test:
Auto merged
mysql-test/suite/ndb/t/ndb_row_format.test:
Auto merged
mysql-test/suite/ndb/t/ndb_single_user.test:
Auto merged
mysql-test/suite/ndb/t/ndb_sp.test:
Auto merged
mysql-test/suite/ndb/t/ndb_subquery.test:
Auto merged
mysql-test/suite/ndb/t/ndb_temporary.test:
Auto merged
mysql-test/suite/ndb/t/ndb_transaction.test:
Auto merged
mysql-test/suite/ndb/t/ndb_trigger.test:
Auto merged
mysql-test/suite/ndb/t/ndb_truncate.test:
Auto merged
mysql-test/suite/ndb/t/ndb_types.test:
Auto merged
mysql-test/suite/ndb/t/ndb_update.test:
Auto merged
mysql-test/suite/ndb/t/ndb_view.test:
Auto merged
mysql-test/suite/ndb/t/ndbapi.test:
Auto merged
mysql-test/suite/ndb/t/ps_7ndb.test:
Auto merged
mysql-test/suite/ndb/t/strict_autoinc_5ndb.test:
Auto merged
mysql-test/suite/rpl/r/rpl_000015.result:
Auto merged
mysql-test/suite/rpl/r/rpl_change_master.result:
Auto merged
mysql-test/suite/rpl/r/rpl_deadlock_innodb.result:
Auto merged
mysql-test/suite/rpl/r/rpl_empty_master_crash.result:
Auto merged
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
Auto merged
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_flushlog_loop.result:
Auto merged
mysql-test/suite/rpl/r/rpl_incident.result:
Auto merged
mysql-test/suite/rpl/r/rpl_innodb.result:
Auto merged
mysql-test/suite/rpl/r/rpl_known_bugs_detection.result:
Auto merged
mysql-test/suite/rpl/r/rpl_loaddata.result:
Auto merged
mysql-test/suite/rpl/r/rpl_log_pos.result:
Auto merged
mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result:
Auto merged
mysql-test/suite/rpl/r/rpl_redirect.result:
Auto merged
mysql-test/suite/rpl/r/rpl_replicate_do.result:
Auto merged
mysql-test/suite/rpl/r/rpl_rotate_logs.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_log.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_log_innodb.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_max_relay_size.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_reset_slave.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_until.result:
Auto merged
mysql-test/suite/rpl/r/rpl_server_id1.result:
Auto merged
mysql-test/suite/rpl/r/rpl_server_id2.result:
Auto merged
mysql-test/suite/rpl/r/rpl_skip_error.result:
Auto merged
mysql-test/suite/rpl/r/rpl_slave_status.result:
Auto merged
mysql-test/suite/rpl/r/rpl_ssl.result:
Auto merged
mysql-test/suite/rpl/r/rpl_ssl1.result:
Auto merged
mysql-test/suite/rpl/r/rpl_stm_log.result:
Auto merged
mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result:
Auto merged
mysql-test/suite/rpl/r/rpl_stm_reset_slave.result:
Auto merged
mysql-test/suite/rpl/r/rpl_stm_until.result:
Auto merged
mysql-test/suite/rpl/r/rpl_udf.result:
Auto merged
mysql-test/suite/rpl/t/rpl_000015.test:
Auto merged
mysql-test/suite/rpl/t/rpl_change_master.test:
Auto merged
mysql-test/suite/rpl/t/rpl_commit_after_flush.test:
Auto merged
mysql-test/suite/rpl/t/rpl_delete_no_where.test:
Auto merged
mysql-test/suite/rpl/t/rpl_empty_master_crash.test:
Auto merged
mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
Auto merged
mysql-test/suite/rpl/t/rpl_innodb.test:
Auto merged
mysql-test/suite/rpl/t/rpl_insert_ignore.test:
Auto merged
mysql-test/suite/rpl/t/rpl_log_pos.test:
Auto merged
mysql-test/suite/rpl/t/rpl_multi_update2.test:
Auto merged
mysql-test/suite/rpl/t/rpl_multi_update3.test:
Auto merged
mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test:
Auto merged
mysql-test/suite/rpl/t/rpl_redirect.test:
Auto merged
mysql-test/suite/rpl/t/rpl_relayrotate.test:
Auto merged
mysql-test/suite/rpl/t/rpl_replicate_do.test:
Auto merged
mysql-test/suite/rpl/t/rpl_rotate_logs.test:
Auto merged
mysql-test/suite/rpl/t/rpl_row_001.test:
Auto merged
mysql-test/suite/rpl/t/rpl_row_UUID.test:
Auto merged
mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test:
Auto merged
mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test:
Auto merged
mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test:
Auto merged
mysql-test/suite/rpl/t/rpl_row_blob_innodb.test:
Auto merged
mysql-test/suite/rpl/t/rpl_row_blob_myisam.test:
Auto merged
mysql-test/suite/rpl/t/rpl_row_charset.test:
Auto merged
mysql-test/suite/rpl/t/rpl_row_func003.test:
Auto merged
mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test:
Auto merged
mysql-test/suite/rpl/t/rpl_row_log.test:
Auto merged
mysql-test/suite/rpl/t/rpl_row_log_innodb.test:
Auto merged
mysql-test/suite/rpl/t/rpl_row_sp003.test:
Auto merged
mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test:
Auto merged
mysql-test/suite/rpl/t/rpl_row_until.test:
Auto merged
mysql-test/suite/rpl/t/rpl_server_id1.test:
Auto merged
mysql-test/suite/rpl/t/rpl_server_id2.test:
Auto merged
mysql-test/suite/rpl/t/rpl_skip_error.test:
Auto merged
mysql-test/suite/rpl/t/rpl_slave_status.test:
Auto merged
mysql-test/suite/rpl/t/rpl_ssl.test:
Auto merged
mysql-test/suite/rpl/t/rpl_ssl1.test:
Auto merged
mysql-test/suite/rpl/t/rpl_stm_log.test:
Auto merged
mysql-test/suite/rpl/t/rpl_stm_until.test:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_log.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test:
Auto merged
BitKeeper/deleted/.del-binlog_row_blackhole.test:
Auto merged
BitKeeper/deleted/.del-binlog_row_blackhole.result:
Auto merged
BitKeeper/deleted/.del-ndb_binlog_basic2.result:
Auto merged
BitKeeper/deleted/.del-ndb_binlog_basic2.test:
Auto merged
mysql-test/t/disabled.def:
Merge
- When creating an index for the sort, the number of rows plus 1 is used
to allocate a buffer. In this test case, the number of rows 4294967295
is the max value of an unsigned integer, so when 1 was added to it, a
buffer of size 0 was allocated causing the crash.
- Create new test suite for this bug's test suite as per QA.
myisam/sort.c:
Bug#27029 alter table ... enable keys crashes mysqld on large table
- Check to make sure the value of records is < UINT_MAX32 to avoid a
false positive on the remaining condition.
mysql-test/suite/large_tests/README.TXT:
Bug#27029 alter table ... enable keys crashes mysqld on large table
- New testsuite for large tests.
- Added mtr hint for potential testers.
mysql-test/suite/large_tests/r/alter_table.result:
Bug#27029 alter table ... enable keys crashes mysqld on large table
- New testsuite for large tests.
- Added results for bug.
mysql-test/suite/large_tests/t/alter_table.test:
Bug#27029 alter table ... enable keys crashes mysqld on large table
- New testsuite for large tests.
- Added test for bug.
- validating current result files
- updating with new features in information_schema / error messages
- forced order by and removed time stamps
removed a_version files that are not needed (now that the suite is in the main tree
Note: datadict tests still fail as a result of bug 28181 (a regression introduced in
5.0.42 - and 5.1.18(?) - tests should runn clean once it is fixed
BitKeeper/deleted/.del-a_version_check.test~82ea7fb267df9e58:
Delete: mysql-test/suite/funcs_1/t/a_version_check.test
BitKeeper/deleted/.del-a_version_check.result~97a8ec1e3211c26:
Delete: mysql-test/suite/funcs_1/r/a_version_check.result
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
Modified to correct failiure to return host name on some systems
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
corrections to fooce order by on queries, replace time stamps with strings and enable the
testing of referential_constraints table
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
corrections to force order by on queries
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Updated result file with order by selects, elimination of time stamps and selects
of empty user (that we don't have anymore) and adding the testing
of referential_constraints table
mysql-test/suite/funcs_1/r/innodb_func_view.result:
confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/innodb_views.result:
confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/r/memory__datadict.result:
Updated result file with order by selects, elimination of time stamps and selects
of empty user (that we don't have anymore) and adding the testing
of referential_constraints table
mysql-test/suite/funcs_1/r/memory_func_view.result:
confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/memory_trig_08.result:
confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/memory_views.result:
confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Updated result file with order by selects, elimination of time stamps and selects
of empty user (that we don't have anymore) and adding the testing
of referential_constraints table
mysql-test/suite/funcs_1/r/myisam_func_view.result:
confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/myisam_views.result:
confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/r/ndb__datadict.result:
Updated result file with order by selects, elimination of time stamps and selects
of empty user (that we don't have anymore) and adding the testing
of referential_constraints table
mysql-test/suite/funcs_1/r/ndb_func_view.result:
confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/ndb_views.result:
confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/t/disabled.def:
Updated disabled messages with clearer ones
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
Added code to test for error in case of a trigger name that is to long
mysql-test/suite/funcs_1/views/views_master.inc:
Correction to remove wrong '--eror' meaningless tag that generated warnings
into linux.site:/home/omer/source/bld51_2
BitKeeper/deleted/.del-a_version_check.result:
Auto merged
BitKeeper/deleted/.del-a_version_check.test:
Auto merged
BitKeeper/deleted/.del-datadict_load.inc:
Auto merged
BitKeeper/deleted/.del-datadict_master.inc:
Auto merged
BitKeeper/deleted/.del-datadict_show_schema.inc:
Auto merged
BitKeeper/deleted/.del-disabled.def~1:
Auto merged
BitKeeper/deleted/.del-innodb__datadict.result:
Auto merged
BitKeeper/deleted/.del-innodb_trig_08.result:
Auto merged
BitKeeper/deleted/.del-innodb_views.result:
Auto merged
BitKeeper/deleted/.del-memory__datadict.result:
Auto merged
BitKeeper/deleted/.del-memory_trig_08.result:
Auto merged
BitKeeper/deleted/.del-memory_views.result:
Auto merged
BitKeeper/deleted/.del-myisam__datadict.result:
Auto merged
BitKeeper/deleted/.del-myisam_trig_08.result:
Auto merged
BitKeeper/deleted/.del-views_master.inc:
Auto merged
BitKeeper/deleted/.del-innodb_func_view.result:
manual merge - using local file
BitKeeper/deleted/.del-memory_func_view.result:
manual merge - using local file
BitKeeper/deleted/.del-myisam_func_view.result:
manual merge - using local file
BitKeeper/deleted/.del-myisam_views.result:
manual merge - using local file
- validated current result files
- forced order by and removed time stamps
removed a_version files (since do not make sense now when suite is in the main tree)
Note: datadict tests still fail as a result of regression bug 28181 in 5.0.42 (discovered
while performing this update) - tests should run clean once bug is fixed
BitKeeper/deleted/.del-a_version_check.test:
Delete: mysql-test/suite/funcs_1/t/a_version_check.test
BitKeeper/deleted/.del-a_version_check.result:
Delete: mysql-test/suite/funcs_1/r/a_version_check.result
BitKeeper/deleted/.del-innodb_views.warnings:
Delete: mysql-test/suite/funcs_1/r/innodb_views.warnings
BitKeeper/deleted/.del-memory_views.warnings:
Delete: mysql-test/suite/funcs_1/r/memory_views.warnings
BitKeeper/deleted/.del-myisam_views.warnings:
Delete: mysql-test/suite/funcs_1/r/myisam_views.warnings
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
Modified to correct failiure to return host name on some systems
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
corrections to force order by on queries and replace time stamps with strings
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
corrections to force order by on queries
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Updated result file with order bu selects, elimination of time stamps
and selects with empty user (that we don't have anymore)
mysql-test/suite/funcs_1/r/innodb_func_view.result:
confirming existing results as correct ones - old result file had wrong cast values returned
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
confirming existing results as correct ones - updated error message
mysql-test/suite/funcs_1/r/innodb_views.result:
confirming existing results as correct ones - returned results are correct,
wrong 'expected' error messages removed
mysql-test/suite/funcs_1/r/memory__datadict.result:
Updated result file with order bu selects, elimination of time stamps
and selects with empty user (that we don't have anymore)
mysql-test/suite/funcs_1/r/memory_func_view.result:
confirming existing results as correct ones - old result file had wrong cast values returned
mysql-test/suite/funcs_1/r/memory_trig_08.result:
confirming existing results as correct ones - updated error message
mysql-test/suite/funcs_1/r/memory_views.result:
confirming existing results as correct ones - returned results are correct,
wrong 'expected' error messages removed
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Updated result file with order bu selects, elimination of time stamps
and selects with empty user (that we don't have anymore)
mysql-test/suite/funcs_1/r/myisam_func_view.result:
confirming existing results as correct ones - old result file had wrong cast values returned
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
confirming existing results as correct ones - updated error message
mysql-test/suite/funcs_1/r/myisam_views.result:
confirming existing results as correct ones - returned results are correct,
wrong 'expected' error messages removed
mysql-test/suite/funcs_1/t/disabled.def:
Updated disabled messages with clearer ones
mysql-test/suite/funcs_1/views/views_master.inc:
removed invalid -- lines generating warning files
mysql-test/suite/funcs_1/r/a_version_check.result:
new version
mysql-test/suite/partitions/include/partition_supported_sql_funcs.inc:
read data from file.
mysql-test/suite/partitions/include/partition_supported_sql_funcs_delete.inc:
read data from file.
mysql-test/suite/partitions/include/partition_supported_sql_funcs_main.inc:
read data from file.
mysql-test/suite/partitions/r/partition_supported_sql_func_innodb.result:
read data from file.
mysql-test/suite/partitions/r/partition_supported_sql_func_myisam.result:
read data from file.
mysql-test/suite/partitions/t/disabled.def:
added not executable test program.
mysql-test/suite/partitions/t/partition_supported_sql_func_innodb.test:
switched to long test.
mysql-test/suite/partitions/t/partition_supported_sql_func_myisam.test:
switched to long test
BitKeeper/etc/ignore:
Added mysql-test/suite/partitions/t/partition.test mysql-test/suite/partitions/r/dif mysql-test/suite/partitions/r/partition.result mysql-test/suite/partitions/r/partition_t55.out mysql-test/suite/partitions/r/partition_t55.refout to the ignore list
mysql-test/suite/partitions/r/partition_supported_sql_func_ndb.result:
new result file.
mysql-test/suite/partitions/t/partition_supported_sql_func_ndb.test:
ndb wrapper.
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_ch1.in:
inpu file.
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_date.in:
input file
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_float.in:
input file
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_int.in:
input file
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_time.in:
input file
mysql-test/suite/partitions/r/partition_t55.out:
reference fiel for output data to compare
This patch corrects errors that occurred in a local manual merge.
It adds the originator column in the results of the SHOW EVENTS command
for a series of tests.
The only code change is to correct references to the classname in
enums.
mysql-test/r/events.result:
WL#3629 - Replication of Invocation and Invoked Features
This patch corrects errors that occurred in a local manual merge.
It adds the originator column in the results of the SHOW EVENTS command.
mysql-test/r/events_bugs.result:
WL#3629 - Replication of Invocation and Invoked Features
This patch corrects errors that occurred in a local manual merge.
It adds the originator column in the results of the SHOW EVENTS command.
mysql-test/r/events_time_zone.result:
WL#3629 - Replication of Invocation and Invoked Features
This patch corrects errors that occurred in a local manual merge.
It adds the originator column in the results of the SHOW EVENTS command.
mysql-test/r/mysqldump.result:
WL#3629 - Replication of Invocation and Invoked Features
This patch corrects errors that occurred in a local manual merge.
It adds the originator column in the results of the SHOW EVENTS command.
mysql-test/r/ps.result:
WL#3629 - Replication of Invocation and Invoked Features
This patch corrects errors that occurred in a local manual merge.
It adds the originator column in the results of the SHOW EVENTS command.
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
WL#3629 - Replication of Invocation and Invoked Features
This patch corrects errors that occurred in a local manual merge.
It adds the originator column in the results of the SHOW EVENTS command.
sql/event_data_objects.cc:
WL#3629 - Replication of Invocation and Invoked Features
This patch corrects errors that occurred in a local manual merge.
It adds the classname to the enums appearing in another patch.
BitKeeper/etc/ignore:
Added mysql-test/mysql-test-run-shell to the ignore list
mysql-test/suite/funcs_2/include/check_charset.inc:
finished files with newline
BitKeeper/etc/ignore:
Added mysql-test/suite/funcs_1/r/innodb_views.warnings mysql-test/suite/funcs_1/r/memory_trig_03e.warnings mysql-test/suite/funcs_1/r/memory_views.warnings mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings mysql-test/suite/funcs_1/r/myisam_views.warnings mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings mysql-test/suite/funcs_1/r/ndb_views.warnings mysql-test/suite/partitions/r/diff mysql-test/suite/partitions/r/partition_bit_ndb.warnings mysql-test/suite/partitions/r/partition_special_innodb.warnings mysql-test/suite/partitions/r/partition_special_myisam.warnings storage/archive/archive_reader mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings to the ignore list
mysql-test/suite/funcs_2/include/check_charset.inc:
inserted newline at the end of file.
mysql-test/suite/objects/include/drop_all.inc:
inserted newline at the end of file.
mysql-test/suite/partitions/include/partition_key_32col.inc:
inserted newline at the end of file.
mysql-test/suite/rpl/data/rpl_mixed.dat:
inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_event.inc:
inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_select.inc:
inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_user.inc:
inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_view.inc:
inserted newline at the end of file.
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_alter_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_alter_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_alter_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_alter_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charlength_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charlength_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charlength_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charlength_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charset_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charset_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charset_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charset_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_convert_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_convert_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_convert_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_convert_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_db_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_db_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_db_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_db_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_tbl_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_tbl_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_tbl_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_tbl_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_enum_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_enum_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_enum_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_enum_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_insert_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_insert_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_insert_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_insert_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_instr_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_instr_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_instr_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_instr_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_join_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_join_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_join_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_join_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_left_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_left_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_left_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_left_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_length_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_length_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_length_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_length_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_like_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_like_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_like_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_like_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_locate_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_locate_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_locate_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_locate_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_lpad_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_lpad_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_lpad_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_lpad_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ltrim_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ltrim_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ltrim_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ltrim_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ps_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ps_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_replace_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_replace_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_replace_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_replace_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_reverse_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_reverse_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_reverse_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_reverse_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_right_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_right_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_right_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_right_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rpad_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rpad_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rpad_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rpad_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rtrim_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rtrim_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rtrim_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rtrim_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_select_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_select_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_select_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_select_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_subquery_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_subquery_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_subquery_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_subquery_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_substring_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_substring_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_substring_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_substring_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_trim_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_trim_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_trim_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_trim_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_union_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_update_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_update_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_update_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_update_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_where_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_where_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_where_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_where_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0201_sjis.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0201_ucs2.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0201_ujis.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0201_utf8.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_sjis.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_sjis2.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_sjis3.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_ucs2.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_ujis.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_utf8.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0212_ucs2.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0212_ujis.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0212_utf8.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_alter_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_alter_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_alter_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_alter_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charlength_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charlength_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charlength_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charlength_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charset_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charset_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charset_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charset_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_convert_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_convert_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_convert_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_convert_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_db_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_db_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_db_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_db_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_tbl_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_tbl_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_tbl_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_tbl_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_enum_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_enum_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_enum_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_enum_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_insert_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_insert_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_insert_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_insert_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_instr_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_instr_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_instr_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_instr_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_join_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_join_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_join_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_join_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_left_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_left_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_left_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_left_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_length_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_length_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_length_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_length_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_like_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_like_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_like_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_like_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_locate_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_locate_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_locate_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_locate_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_lpad_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_lpad_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_lpad_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_lpad_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ltrim_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ltrim_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ltrim_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ltrim_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ps_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ps_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_replace_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_replace_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_replace_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_replace_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_reverse_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_reverse_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_reverse_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_reverse_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_right_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_right_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_right_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_right_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rpad_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rpad_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rpad_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rpad_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rtrim_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rtrim_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rtrim_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rtrim_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_select_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_select_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_select_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_select_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_subquery_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_subquery_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_subquery_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_subquery_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_substring_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_substring_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_substring_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_substring_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_trim_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_trim_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_trim_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_trim_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_union_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_update_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_update_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_update_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_update_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_where_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_where_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_where_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_where_utf8.test:
Change mode to -rw-rw----
I have put the tests into a separate "suite", the first one actually.
Currently this can only be run by the Perl version of mysql-test-run
that is not quite finished. It should, or at least will, be able to
be run with the line
./mysql-test-run.pl --suite=jp
