into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
client/mysqlbinlog.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_class.cc:
Auto merged
mysql-test/r/multi_update.result:
Result change.
mysql-test/r/rpl_bug33931.result:
Result change.
mysql-test/suite/ndb/r/ndb_binlog_format.result:
Result change.
into stella.local:/home2/mydev/mysql-5.1-axmrg
configure.in:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_table.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
mysql-test/suite/rpl/r/rpl_events.result:
Result change.
mysql-test/suite/rpl/t/rpl_events.test:
Replacing table with varying contents with a fresh table to avoid
test problems. The contents of the event is unimportant for this
part of the test.
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
extra/resolveip.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/disabled.def:
Take both new entries into "disabled.def".
irrelevant to execute since the charset information does not
affect replication for row-based replication. The row-based
versions of the tests were removed, and the statement-based
version of the test was made executable by all three modes.
This involves removing any lines that causes the test to be
dependent on the contents of the binary log, and instead we
just check that the replication works as it should.
BitKeeper/deleted/.del-rpl_ndb_charset.test:
Delete: mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test
BitKeeper/deleted/.del-rpl_ndb_charset.result:
Delete: mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result
BitKeeper/deleted/.del-rpl_row_charset.test:
Delete: mysql-test/extra/rpl_tests/rpl_row_charset.test
BitKeeper/deleted/.del-rpl_row_charset.test~739be9df1baaee3e:
Delete: mysql-test/suite/rpl/t/rpl_row_charset.test
BitKeeper/deleted/.del-rpl_row_charset_innodb.test:
Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb.test
BitKeeper/deleted/.del-rpl_row_charset_innodb-master.opt:
Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt
BitKeeper/deleted/.del-rpl_row_charset_innodb-slave.opt:
Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt
BitKeeper/deleted/.del-rpl_row_charset_innodb.result:
Delete: mysql-test/suite/rpl/r/rpl_row_charset_innodb.result
BitKeeper/deleted/.del-rpl_row_charset.result:
Delete: mysql-test/suite/rpl/r/rpl_row_charset.result
mysql-test/extra/rpl_tests/rpl_charset.test:
Test is not dependent on binlog format any more.
Using --echo instead of "select" to print text.
Removing lines causing the test to be dependent on binlog contents.
mysql-test/suite/rpl/r/rpl_charset.result:
Result change.
mysql-test/suite/rpl/t/rpl_charset.test:
Using renamed version of test file.
but not collation.
The problem here was that text literals in a view were always
dumped with character set introducer. That lead to loosing
collation information.
The fix is to dump character set introducer only if it was
in the original query. That is now possible because there
is no problem any more of loss of character set of string
literals in views -- after WL#4052 the view is dumped
in the original character set.
mysql-test/r/case.result:
Update result file.
mysql-test/r/compress.result:
Update result file.
mysql-test/r/ctype_collate.result:
Update result file.
mysql-test/r/date_formats.result:
Update result file.
mysql-test/r/ddl_i18n_koi8r.result:
Update result file.
mysql-test/r/ddl_i18n_utf8.result:
Update result file.
mysql-test/r/fulltext.result:
Update result file.
mysql-test/r/func_crypt.result:
Update result file.
mysql-test/r/func_encrypt.result:
Update result file.
mysql-test/r/func_if.result:
Update result file.
mysql-test/r/func_in.result:
Update result file.
mysql-test/r/func_like.result:
Update result file.
mysql-test/r/func_regexp.result:
Update result file.
mysql-test/r/func_set.result:
Update result file.
mysql-test/r/func_str.result:
Update result file.
mysql-test/r/func_time.result:
Update result file.
mysql-test/r/gis.result:
Update result file.
mysql-test/r/group_min_max.result:
Update result file.
mysql-test/r/mysqldump.result:
Update result file.
mysql-test/r/negation_elimination.result:
Update result file.
mysql-test/r/null.result:
Update result file.
mysql-test/r/select.result:
Update result file.
mysql-test/r/show_check.result:
Update result file.
mysql-test/r/sp-code.result:
Update result file.
mysql-test/r/ssl.result:
Update result file.
mysql-test/r/ssl_compress.result:
Update result file.
mysql-test/r/subselect.result:
Update result file.
mysql-test/r/temp_table.result:
Update result file.
mysql-test/r/type_blob.result:
Update result file.
mysql-test/r/view.result:
Update result file.
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
Update result file.
mysql-test/suite/rpl/r/rpl_get_lock.result:
Update result file.
mysql-test/suite/rpl/r/rpl_master_pos_wait.result:
Update result file.
mysql-test/t/view.test:
Add a test case for Bug#32538.
sql/item.cc:
Do not dump character set introducer if it was not specified
explicitly in the original query.
sql/item.h:
Add 'cs_specified' property to Item_string.
sql/sql_yacc.yy:
Set Item_string::cs_specified property to TRUE
when character set introducer is explicitly specified.
mysql-test/t/variables.test, because:
- mysql-test/suite/rpl/t/rpl_variables.test does not replicate anything,
so should not be in the rpl suite.
- mysql-test/t/variables.test is the place for testing variable-related
problems and features.
- I will soon commit a patch containing a test case that tests
replication of variables. It would be good if I could call the test case
mysql-test/suite/rpl/t/rpl_variables.test. I'm making place for that now.
mysql-test/t/variables-master.opt:
Rename: mysql-test/suite/rpl/t/rpl_variables-master.opt -> mysql-test/t/variables-master.opt
BitKeeper/deleted/.del-rpl_variables.test:
Delete: mysql-test/suite/rpl/t/rpl_variables.test
BitKeeper/deleted/.del-rpl_variables.result:
Delete: mysql-test/suite/rpl/r/rpl_variables.result
mysql-test/r/variables.result:
Moved mysql-test/suite/rpl/t/rpl_variables.test into
mysql-test/t/variables.test . Result file needs to be updated.
mysql-test/t/variables.test:
Moved mysql-test/suite/rpl/t/rpl_variables.test into
mysql-test/t/variables.test .
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
mysql-test/mysql-test-run.pl:
Auto merged
sql/log_event.cc:
Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
manual merge
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1
mysql-test/mysql-test-run.pl:
Auto merged
sql/rpl_rli.cc:
Auto merged
sql/rpl_rli.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_binlog.cc:
Auto merged
Problem was that it did not work with corrupted/crashed tables.
Solution is to disable these commands until WL#4176 is completed
mysql-test/r/partition.result:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Test result
mysql-test/suite/parts/inc/partition_alter4.inc:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
copy-paste error, changed from REBUILT to REPAIR, as the heading says
mysql-test/suite/parts/r/partition_alter1_innodb.result:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Test result
mysql-test/suite/parts/r/partition_alter1_myisam.result:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Test result
mysql-test/suite/parts/r/partition_alter2_innodb.result:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Test result
mysql-test/suite/parts/r/partition_alter2_myisam.result:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Test result
mysql-test/suite/parts/r/partition_basic_innodb.result:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Test result
mysql-test/suite/parts/r/partition_basic_myisam.result:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Test result
mysql-test/suite/parts/r/partition_engine_innodb.result:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Test result
mysql-test/suite/parts/r/partition_engine_myisam.result:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Test result
mysql-test/suite/parts/t/disabled.def:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Disabled test since the tested feature is not longer supported
mysql-test/t/partition.test:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
OPTIMIZE PARTITION is not longer supported, waiting for WL#4176
sql/ha_partition.cc:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Problem was that it did not work with corrupted/crashed tables.
Solution is to disable these commands until WL#4176 is completed
(returning HA_ADMIN_NOT_IMPLEMENTED and
#ifdef'ed the non-reachable code)
because it uses BINLOG statement, which is not supported in embedded mode.
Fix: disable the test in embedded mode.
mysql-test/suite/binlog/t/binlog_base64_flag.test:
Must disable this test when running embedded, since BINLOG statements
don't work. This fixes the pushbuild problem on the debx86-b machine on
https://intranet.mysql.com/secure/pushbuild/showpush.pl?dir=mysql-5.1-new-rpl&order=469
Problem: mysqlbinlog does not free memory if an error happens.
Fix: binlog-processing functions do not call exit() anymore. Instead, they
print an error and return an error code. Error codes are propagated all
the way back to main, and all allocated memory is freed on the way.
client/mysqlbinlog.cc:
- New error handling policy: functions processing binlogs don't just
exit() anymore. Instead, they print a message and return an error
status.
- New policy for the global `mysql' and `glob_description_event': these
are not passed as parameters anymore. The global pointer is used
instead.
- More error situations are detected and reported.
- Better error messages: the program never terminates with exit status 1
without explanation any more. Fixed spelling errors. Use consistent
format of messages (a single line beginning with "ERROR: " or
"WARNING: " and ending with "." is printed to stderr.)
- New memory handling: memory is always freed on program termination.
- Better comments: more functions are explained, doxygen is used, and
more precise formulations in some existing comments.
mysql-test/suite/binlog/r/binlog_base64_flag.result:
Result file updated since output format of mysqlbinlog changed while the
test was disabled.
mysql-test/suite/binlog/t/binlog_killed.test:
Mysqlbinlog now works as described when the binlog is open. Hence, the
--force-if-open flag must be passed
mysql-test/suite/binlog/t/binlog_killed_simulate.test:
Mysqlbinlog now works as described when the binlog is open. Hence, the
--force-if-open flag must be passed
mysql-test/suite/binlog/t/disabled.def:
Now that mysqlbinlog cleans up after itself on abnormal termination, we
can enable this test again.
into dipika.(none):/opt/local/work/mysql-5.1-runtime
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/suite/binlog/r/binlog_row_binlog.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_view.cc:
Auto merged
mysql-test/extra/binlog_tests/binlog.test:
Manual merge of binlog test case for Bug#33798
mysql-test/suite/binlog/r/binlog_row_binlog.result:
Add test case result for Bug#33798
mysql-test/suite/binlog/r/binlog_stm_binlog.result:
Add test case result for Bug#33798
sql/item.cc:
Use new method which accepts a unsigned flag.
Pre push fix:
added --sorted_result for consistent results
mysql-test/suite/parts/inc/partition_bit.inc:
Bug#34225: suite/parts test failure
added --sorted_result for consistent results
mysql-test/suite/parts/r/partition_bit_innodb.result:
Bug#34225: suite/parts test failure
added --sorted_result for consistent results
mysql-test/suite/parts/r/partition_bit_myisam.result:
Bug#34225: suite/parts test failure
added --sorted_result for consistent results
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result:
Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
Auto merged
sql/log_event.cc:
Auto merged
Since it used /tmp-dir, it continues to fail on the same server
until the /tmp-dir is cleaned. (Another problem was that it
uses DATA/INDEX DIR without checking for symlink, which is needed)
Solution:
Moved all DATA/INDEX DIR test to a new partition_basic_symlink.inc file
and use this for myisam and innodb, also requiring symlinks and
not_windows.
(i.e. removed DATA/INDEX DIR use from several tests)
mysql-test/suite/parts/inc/partition_basic.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_bigint.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_binary.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_bit.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_blob.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_char.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_date.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_datetime.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_decimal.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_double.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_enum.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_float.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_int.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_key_16col.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_key_32col.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_key_4col.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_key_8col.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_mediumint.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_set.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_smallint.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_text.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_time.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_timestamp.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_tinyint.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_varbinary.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_varchar.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_year.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_basic_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_basic_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_bit_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_bit_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_char_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_char_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_datetime_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_datetime_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_decimal_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_decimal_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_float_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_float_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_int_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_int_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_special_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_special_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/t/partition_sessions.test:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_basic_symlink.inc:
Bug#34225: test suit parts uses /tmp-dir
Added this test case for testing some DATA/INDEX DIRECTORY cases
since I removed so much of it from all other tests.
mysql-test/suite/parts/r/partition_basic_symlink_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Added this test case for testing some DATA/INDEX DIRECTORY cases
since I removed so much of it from all other tests.
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Added this test case for testing some DATA/INDEX DIRECTORY cases
since I removed so much of it from all other tests.
mysql-test/suite/parts/t/partition_basic_symlink_innodb.test:
Bug#34225: test suit parts uses /tmp-dir
Added this test case for testing some DATA/INDEX DIRECTORY cases
since I removed so much of it from all other tests.
mysql-test/suite/parts/t/partition_basic_symlink_myisam.test:
Bug#34225: test suit parts uses /tmp-dir
Added this test case for testing some DATA/INDEX DIRECTORY cases
since I removed so much of it from all other tests.
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
include/my_base.h:
Auto merged
mysql-test/include/show_binlog_events2.inc:
Auto merged
mysql-test/suite/binlog/t/binlog_old_versions.test:
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/t/rpl_loaddata_map-master.opt:
Auto merged
mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt:
Auto merged
sql/log_event_old.cc:
Auto merged
sql/sql_binlog.cc:
Auto merged
mysql-test/suite/rpl/r/rpl_loaddata_map.result:
Manual merge.
mysql-test/suite/rpl/r/rpl_user.result:
Manual merge.
mysql-test/suite/rpl/t/rpl_loaddata_map.test:
Manual merge.
mysql-test/suite/rpl/t/rpl_user.test:
Manual merge.
sql/log_event.cc:
Manual merge.
sql/rpl_record.cc:
Manual merge.
mysql-test/suite/rpl/r/rpl_row_trig001.result:
Result change.
mysql-test/suite/rpl/t/rpl_row_trig001.test:
Correcting a typo and trying to avoid a race condition when
dumping the contents of the master and slave for comparison.
make sure to alloc logspace and set bits
if doing delete after previous update wo/ touching DD part
mysql-test/suite/ndb/r/ndb_dd_basic.result:
testcase
mysql-test/suite/ndb/t/ndb_dd_basic.test:
testcase
exists t1,t2,t3'
Bug #34245 Test ndb_binlog_multi fails for 'CREATE TABLE'
Bug #34246 Test rpl_ndb_transaction fails with 'Failed to create
'mysql/ndb_apply_status'
Tests cases didn't wait for cluster to come up due to a typo
in have_multi_ndb.inc.
mysql-test/include/have_multi_ndb.inc:
SHOW TABLES is case-sensitive in the pattern to LIKE.
mysql-test/suite/ndb/t/disabled.def:
Enabling tests.
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
Adding include of have_debug since test requires that.
sql/sql_repl.cc:
Replacing 'return' with 'DBUG_RETURN' in debug-traced function.
