The failure was caused by executing a CREATE-SELECT statement that creates a
table in another database than the current one. In row-based logging, the
CREATE statement was written to the binary log without the database, hence
creating the table in the wrong database, causing the following inserts to
fail since the table didn't exist in the given database.
Fixed the bug by adding a parameter to store_create_info() that will make
the function print the database name before the table name and used that
in the calls that write the CREATE statement to the binary log. The database
name is only printed if it is different than the currently selected database.
The output of SHOW CREATE TABLE has not changed and is still printed without
the database name.
mysql-test/suite/rpl/r/rpl_row_create_table.result:
Result file change.
mysql-test/suite/rpl/t/rpl_row_create_table.test:
Added test to check that CREATE-SELECT into another database than the
current one replicates.
sql/sql_insert.cc:
Adding parameter to calls to store_create_info().
sql/sql_show.cc:
Adding parameter to calls to store_create_info().
Extending store_create_info() with parameter 'show_database' that will cause
the database to be written before the table name.
sql/sql_show.h:
Adding parameter to call to store_create_info() to tell if the database should be shown or not.
sql/sql_table.cc:
Adding parameter to calls to store_create_info().
Bug#35161
Fixed memory leak when failing to open a partition.
Bug#20129
Added tests for verifying REPAIR PARTITION.
mysql-test/std_data/parts/t1_will_crash#P#p1_first_1024.MYD:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... not working
(see mysql-test/suite/parts/t/partition_repair_myisam.test
Created by:
CREATE TABLE t1_will_crash (
a VARCHAR(255),
b INT,
c LONGTEXT,
PRIMARY KEY (a, b))ENGINE=MyISAM
PARTITION BY HASH (b)
PARTITIONS 7;
INSERT INTO t1_will_crash VALUES ...
and then
head -c 1024 var/master-data/test/t1_will_crash#P#p1.MYD
into this file.
mysql-test/std_data/parts/t1_will_crash#P#p2.MYD:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... not working
(see mysql-test/suite/parts/t/partition_repair_myisam.test)
copy of file right after _mi_mark_file_changed in mi_write
was done.
mysql-test/std_data/parts/t1_will_crash#P#p2.MYI:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... not working
(see mysql-test/suite/parts/t/partition_repair_myisam.test)
copy of file right after _mi_mark_file_changed in mi_write
was done.
mysql-test/std_data/parts/t1_will_crash#P#p3.MYI:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... not working
(see mysql-test/suite/parts/t/partition_repair_myisam.test)
copy of file right after *share->write_record was done.
mysql-test/std_data/parts/t1_will_crash#P#p4.MYI:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... not working
(see mysql-test/suite/parts/t/partition_repair_myisam.test)
copy of file right after flush_cached_blocks
mysql-test/std_data/parts/t1_will_crash#P#p6.MYD:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... not working
(see mysql-test/suite/parts/t/partition_repair_myisam.test)
copy of file right after _mi_write_part_record in
write_dynamic_record returned for the first time.
mysql-test/std_data/parts/t1_will_crash#P#p6_2.MYD:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... not working
(see mysql-test/suite/parts/t/partition_repair_myisam.test)
copy of file right after _mi_write_part_record in
write_dynamic_record returned for the second time.
mysql-test/std_data/parts/t1_will_crash#P#p6_3.MYD:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... not working
(see mysql-test/suite/parts/t/partition_repair_myisam.test)
copy of file right after _mi_write_part_record in
write_dynamic_record returned for the third time.
(data file fully updated).
mysql-test/suite/parts/r/partition_recover_myisam.result:
Bug#35161
Renamed since it was a test of recover
and to make repair free for use without
--myisam-recover
mysql-test/suite/parts/r/partition_repair_myisam.result:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... not working
New result file for testing CHECK/REPAIR of partitioned tables
mysql-test/suite/parts/t/partition_recover_myisam-master.opt:
Bug#35161
Renamed since it was a test of recover
and to make repair free for use without
--myisam-recover
mysql-test/suite/parts/t/partition_recover_myisam.test:
Bug#35161
Renamed since it was a test of recover
and to make repair free for use without
--myisam-recover
mysql-test/suite/parts/t/partition_repair_myisam.test:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... not working
New test file for testing CHECK/REPAIR of partitioned tables
sql/ha_partition.cc:
Bug#35161
Fix of memory leak when open of partition failed.
mysql-test/suite/binlog/r/binlog_killed_simulate.result:
update result
mysql-test/suite/rpl/r/rpl_stm_log.result:
update result
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test:
correct a typo
pb notices differences in results at the very beginning of the test.
Absense of mysql.ndb_apply_status must be benign anyway, but the warning should not happen
if have_ndb.inc is invoked ahead of ndb_master-slave.
Fixed with relocation of the macros.
mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test:
positioning have_ndb prior ndb_master-slave
partition is corrupt
Updated result files after merge
mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Updated result file after merge
mysql-test/suite/parts/t/disabled.def:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Enabled two tests after fixing the bug.
partition is corrupt
The main problem was that ALTER TABLE t ANALYZE/CHECK/OPTIMIZE/REPAIR
PARTITION took another code path (over mysql_alter_table instead of
mysql_admin_table) which differs in two ways:
1) alter table opens the tables in a different way than admin tables do
resulting in returning with error before it tried the command
2) alter table does not start to send any diagnostic rows to the client
which the lower admin functions continue to use -> resulting in
assertion crash
The fix:
Remapped ALTER TABLE t ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION to use
the same code path as ANALYZE/CHECK/OPTIMIZE/REPAIR TABLE t.
Adding check in mysql_admin_table to setup the partition list for
which partitions that should be used.
Partitioned tables will still not work with
REPAIR TABLE/PARTITION USE_FRM, since that requires moving partitions
to tables, REPAIR TABLE t USE_FRM, and check that the data still
fulfills the partitioning function and then move the table back to
being a partition.
NOTE: I have removed the following functions from the handler
interface:
analyze_partitions, check_partitions, optimize_partitions,
repair_partitions
Since they are not longer needed.
THIS ALTERS THE STORAGE ENGINE API
mysql-test/r/handler_innodb.result:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Added a note result row.
mysql-test/r/innodb.result:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Added a note result row.
mysql-test/r/innodb_mysql.result:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Added a note result row.
mysql-test/r/partition.result:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned
tables.
mysql-test/r/trigger-trans.result:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Added a note result row.
mysql-test/suite/ndb/r/ndb_partition_key.result:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned
tables.
mysql-test/suite/ndb/t/ndb_partition_key.test:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned
tables.
mysql-test/suite/parts/inc/partition_alter4.inc:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned
tables.
mysql-test/suite/parts/r/partition_alter4_innodb.result:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned
tables.
mysql-test/suite/parts/r/partition_alter4_myisam.result:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned
tables.
mysql-test/suite/rpl/r/rpl_failed_optimize.result:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Added a note result row.
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Added a note result row.
mysql-test/t/partition.test:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Updated after fixing ANALYZE/CHECK/OPTIMIZE/REPAIR partitioned
tables.
sql/ha_partition.cc:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Added a function for returning admin commands result rows
Updated handle_opt_partitions to handle admin commands result rows,
and some error filtering (as mysql_admin_table do).
Removed the functions analyze/check/optimize/repair_partitions
since they have no longer any use.
sql/ha_partition.h:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Removed analyze/check/optimize/repair_partitions since they
are no longer are needed.
sql/handler.cc:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Removed analyze/check/optimize/repair_partitions since they
are no longer are needed.
sql/handler.h:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Removed analyze/check/optimize/repair_partitions since they
are no longer are needed.
sql/mysql_priv.h:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Added set_part_state for reuse of code in mysql_admin_table.
(Originally fond in sql/sql_partition.cc:prep_alter_part_table)
sql/protocol.cc:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Added one assert and a debug print.
sql/sql_partition.cc:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Refactored code for setting up partition state, set_part_state,
now used in both prep_alter_part_table and
sql_table.cc:mysql_admin_table.
Removed code for handling ANALYZE/CHECK/OPTIMIZE/REPAIR partitions,
since it is now handled by mysql_admin_table.
sql/sql_table.cc:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Added functionality in mysql_admin_table to work with partitioned
tables.
Fixed a possible assertion bug for HA_ADMIN_TRY_ALTER
(If analyze would output a row, it fails since the row was already
started).
sql/sql_yacc.yy:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Remapped ALTER TABLE t ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
to use the same code path as ANALYZE/CHECK/OPTIMIZE/REPAIR TABLE
instead of taking the ALTER TABLE path.
Added reset of alter_info for ANALYZE/CHECK/OPTIMIZE/REPAIR TABLE
since it is now used by partitioned tables.
storage/myisam/mi_check.c:
Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
partition is corrupt
Changed warning message from "Found X parts Should be: Y parts"
to "Found X key parts. Should be Y", since it could be confusing
with partitioned tables.
manually resolved conflicts:
Text conflict in client/mysqltest.c
Contents conflict in mysql-test/include/have_bug25714.inc
Text conflict in mysql-test/include/have_ndbapi_examples.inc
Text conflict in mysql-test/mysql-test-run.pl
Text conflict in mysql-test/suite/parts/inc/partition_check_drop.inc
Text conflict in mysql-test/suite/parts/inc/partition_layout.inc
Text conflict in mysql-test/suite/parts/inc/partition_layout_check1.inc
Text conflict in mysql-test/suite/parts/inc/partition_layout_check2.inc
Text conflict in mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter1_1_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter1_2_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter2_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter3_innodb.result
Text conflict in mysql-test/suite/parts/r/partition_alter3_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_basic_innodb.result
Text conflict in mysql-test/suite/parts/r/partition_basic_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_engine_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_syntax_myisam.result
Text conflict in mysql-test/suite/rpl_ndb/t/disabled.def
Text conflict in mysql-test/t/disabled.def
The problem of this bug is that we need to get the list of tables
to be updated for a multi-table update statement, which requires to
open all the tables referenced by the statement and resolve all
the fields involved in update in order to figure out the list of
tables for update. However if there are replicate filter rules,
some tables might not exist on slave and result in a failure
before we could examine the filter rules.
I think the whole problem can not be solved on slave alone,
the master must record and send the information of tables
involved for update to slave, so that the slave do not need to
open all the tables referenced by the multi-table update statement to
figure out which tables are involved for update.
So a status variable is added to Query_log event to store the
value of table map for update on master. And on slave, it will
try to get the value of this variable and use it to examine
filter rules without opening any tables on slave, if this values
is not available, the old approach is used and thus the bug will
still occur for when replicating from old masters.
sql/sql_class.h:
add member table_map_for_update to THD
sql/sql_parse.cc:
check filter rules by using table_map_for_update value
sql/sql_update.cc:
save the value of table_map_for_update
Post-push fix: updated some result files that were affected
by the previous fix to this bug.
mysql-test/suite/binlog/r/binlog_killed_simulate.result:
Updated result file.
mysql-test/suite/binlog/r/binlog_row_binlog.result:
Updated result file.
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
Updated result file.
mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result:
Updated result file.
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
Updated result file.
mysql-test/suite/rpl/r/rpl_stm_log.result:
Updated result file.
Problem: Extra new line appeared in jisx0208_sjis2.dat in a mistake, which
broke jp_convert_sjis and jp_select_sjis tests.
Fix: removing extra line
mysql-test/suite/jp/std_data/jisx0208_sjis2.dat:
removing wrong extra new line
mysql-test/suite/jp/t/disabled.def:
activating disabled tests
Problem: binlog_stm_binlog runs INSERT DELAYED queries, and
then prints the contents of the binlog. Before checking the
contents of the binlog, the test waits until the rows have
appeared in the table. However, this is not enough, since
INSERT DELAYED does not write rows to the binlog at the same
time as it writes them to the table. So there is a race.
Fix: Add a FLUSH TABLES before SHOW BINLOG EVENTS. That
waits until the insert_delayed thread is done.
mysql-test/extra/binlog_tests/binlog_insert_delayed.test:
- Added FLUSH TABLES, so that SHOW BINLOG EVENTS becomes
deterministic.
- Added comments.
- Removed unnecessary 'set @@session.auto_increment_increment'
statements.
- Removed unnecessary check that the number of rows inserted
to the table is 11.
mysql-test/suite/binlog/r/binlog_stm_binlog.result:
updated result file
BUG#37884: rpl_row_basic_2myisam and rpl_row_basic_3innodb fail sporadically in pushbuild
These have been fixed in 5.1-rpl. Re-applying fix for BUG#37884
in 5.1-bugteam, and disabling rpl_flushlog_loop for BUG#37733 in
5.1-bugteam.
mysql-test/extra/rpl_tests/rpl_row_basic.test:
Missing sync_slave_with_master added.
mysql-test/suite/rpl/t/disabled.def:
Disabling rpl_flushlog_loop until the fixed version gets
merged from 5.1-rpl
Problem: After START SLAVE, the Slave_IO_Status column of
SHOW SLAVE STATUS goes from No to Yes asynchronously. That
caused sporadic failures on pushbuild in rpl_stm_until since
the test contains SHOW SLAVE STATUS right after START SLAVE.
Fix: Wait until Slave_IO_Status becomes Yes after each
START SLAVE.
mysql-test/include/wait_for_slave_io_to_start.inc:
Macro that waits until the Slave_IO_Running field of
SHOW SLAVE STATUS becomes Yes.
mysql-test/suite/rpl/r/rpl_stm_until.result:
updated result file
mysql-test/suite/rpl/t/rpl_stm_until.test:
- Added wait_for_slave_io_to_start after each start slave.
- Removed unused initialization of test variable $VERSION
- Added comments.
Problem: the test waits for a 'DROP TEMPORARY TABLE' event to
appear in the master's binlog, then checks on the slave whether
the number of temporary tables has decreased. The slave does
not sync, causing a race.
Fix: check for the 'DROP TEMPORARY TABLE' event on slave
instead of on master.
mysql-test/suite/rpl/t/rpl_trunc_temp.test:
- Fixed BUG#37493 by waiting for the event on the slave
instead of on the master.
- Added comments.
This is not a fix to the bug. It only adds debug info, so
that we can analyze the bug better next time it happens.
Please revert the patch after the bug is fixed.
mysql-test/suite/rpl/t/rpl_incident.test:
Added debug info. This will only be printed if the
test fails.
the reason for the failure is that io thread passes through a sequence of state
changes before it eventually got stuck at the expect running state as NO.
It's unreasonble to wait for the running status while the whole idea of the test is
to get to the IO thread error.
Fixed with changing the waiting condition.
mysql-test/suite/rpl/r/rpl_server_id1.result:
results changed
mysql-test/suite/rpl/t/disabled.def:
re-enabling rpl_server_id1
mysql-test/suite/rpl/t/rpl_server_id1.test:
deploying the exact waiting condition i.e to wait for the slave io error.
Problem: master binlog has 'create table t1'. Master binlog
was removed before slave could replicate it. In test's cleanup
code, master did 'drop table t1', which caused slave sql
thread to stop with an error since slave sql thread did not
know about t1.
Fix: t1 is just an auxiliary construction, only needed on
master. Hence, we turn off binlogging before t1 is created,
drop t1 as soon as we don't need it anymore, and then turn
on binlogging again.
mysql-test/include/show_binlog_events.inc:
Filter out directories and block_len from
LOAD DATA INFILE events.
mysql-test/suite/rpl/r/rpl_loaddata_map.result:
updated result file
mysql-test/suite/rpl/t/rpl_loaddata_map.test:
Turn off binlogging while t1 is used, drop t1 as soon
as we don't need it anymore, and turn on binlogging again.
Also added some comments and replaced 'show binlog events'
by 'source include/show_binlog_events.inc'.
Many dump threads can exist due to a way the new version of mtr governs suites.
For this immediate problem the test is refined not to use I_S but rather to reconnect
explicitly with preserving logics of a an old target bug fixes verification.
mysql-test/suite/rpl/r/rpl_temporary.result:
results changed
mysql-test/suite/rpl/t/rpl_temporary.test:
refining the bug#17284 test to avoid counting dump threads in favor to reconnect
explicitly with preserving the orig logics.
Problem: the test set @@global.init_slave to garbage at a time
which was not guaranteed to be after the time when the slave's
SQL thread used it. That would cause the slave's SQL thread to
stop in rare cases.
Fix: The test does not care about the value of
@@global.init_slave, except that it should be different on
master and slave. Hence, we set @@global.init_slave to
something that is valid SQL.
mysql-test/suite/rpl/r/rpl_variables.result:
updated result file.
mysql-test/suite/rpl/t/rpl_variables.test:
Set @@global.init_slave to something that is valid SQL.
Post-post-push fix. The result file for rpl_rbr_to_sbr needs to be
updated. While I was there, made rpl_rbr_to_sbr clean up after itself
by reverting @@binlog_format to the value it had before the test
started.
mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result:
Updated result file
mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test:
Made the test clean up after itself by reverting @@binlog_format
to its original value.
Problem was that ha_partition had HA_FILE_BASED flag set
(since it uses a .par file), but after open it uses the first partitions
flags, which results in different case handling for create and for
open.
Solution was to change the underlying partition name so it was consistent.
(Only happens when lower_case_table_names = 2, i.e. Mac OS X and storage
engines without HA_FILE_BASED, like InnoDB and Memory.)
(Recommit after adding rename of check_lowercase_names to
get_canonical_filename, and moved it from handler.h to mysql_priv.h)
NOTE: if a mixed case name for a partitioned table was created when
lower_case_table_name = 2 it should be renamed or dropped before using
the updated version (See bug#37402 for more info)
mysql-test/include/have_case_insensitive_file_system.inc:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
Added include file.
mysql-test/include/have_lowercase0.inc:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
moved case insensitive file system to a new file, leaving only
lower_case_table_names.
mysql-test/include/have_lowercase2.inc:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
Added include file.
mysql-test/lib/mtr_report.pl:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
Removed a duplicate row and suppressed warning about setting
lower_case_table_names to 2 on case sensitive file systems.
mysql-test/r/case_insensitive_file_system.require:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
Added requirement file.
mysql-test/r/lowercase0.require:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
moved case insensitive file system to a new file, leaving only
lower_case_table_names.
mysql-test/suite/parts/inc/partition_mgm.inc:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New include file for testing partitioning management functions for different
settings of lower_case_table_names.
mysql-test/suite/parts/r/partition_mgm_lc0_archive.result:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New result file.
mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New result file.
mysql-test/suite/parts/r/partition_mgm_lc0_memory.result:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New result file.
mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New result file.
mysql-test/suite/parts/r/partition_mgm_lc0_ndb.result:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New result file.
mysql-test/suite/parts/r/partition_mgm_lc1_archive.result:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New result file.
mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New result file.
mysql-test/suite/parts/r/partition_mgm_lc1_memory.result:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New result file.
mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New result file.
mysql-test/suite/parts/r/partition_mgm_lc1_ndb.result:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New result file.
mysql-test/suite/parts/r/partition_mgm_lc2_archive.result:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New result file.
mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New result file.
mysql-test/suite/parts/r/partition_mgm_lc2_memory.result:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New result file.
mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New result file.
mysql-test/suite/parts/r/partition_mgm_lc2_ndb.result:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New result file.
mysql-test/suite/parts/t/partition_mgm_lc0_archive.test:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New test file.
mysql-test/suite/parts/t/partition_mgm_lc0_innodb.test:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New test file.
mysql-test/suite/parts/t/partition_mgm_lc0_memory.test:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New test file.
mysql-test/suite/parts/t/partition_mgm_lc0_myisam.test:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New test file.
mysql-test/suite/parts/t/partition_mgm_lc0_ndb.test:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New test file.
mysql-test/suite/parts/t/partition_mgm_lc1_archive-master.opt:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New opt file.
mysql-test/suite/parts/t/partition_mgm_lc1_archive.test:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New test file.
mysql-test/suite/parts/t/partition_mgm_lc1_innodb-master.opt:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New opt file.
mysql-test/suite/parts/t/partition_mgm_lc1_innodb.test:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New test file.
mysql-test/suite/parts/t/partition_mgm_lc1_memory-master.opt:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New opt file.
mysql-test/suite/parts/t/partition_mgm_lc1_memory.test:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New test file.
mysql-test/suite/parts/t/partition_mgm_lc1_myisam-master.opt:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New opt file.
mysql-test/suite/parts/t/partition_mgm_lc1_myisam.test:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New test file.
mysql-test/suite/parts/t/partition_mgm_lc1_ndb-master.opt:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New opt file.
mysql-test/suite/parts/t/partition_mgm_lc1_ndb.test:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New test file.
mysql-test/suite/parts/t/partition_mgm_lc2_archive-master.opt:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New opt file.
mysql-test/suite/parts/t/partition_mgm_lc2_archive.test:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New test file.
mysql-test/suite/parts/t/partition_mgm_lc2_innodb-master.opt:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New opt file.
mysql-test/suite/parts/t/partition_mgm_lc2_innodb.test:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New test file.
mysql-test/suite/parts/t/partition_mgm_lc2_memory-master.opt:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New opt file.
mysql-test/suite/parts/t/partition_mgm_lc2_memory.test:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New test file.
mysql-test/suite/parts/t/partition_mgm_lc2_myisam-master.opt:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New opt file.
mysql-test/suite/parts/t/partition_mgm_lc2_myisam.test:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New test file.
mysql-test/suite/parts/t/partition_mgm_lc2_ndb-master.opt:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New opt file.
mysql-test/suite/parts/t/partition_mgm_lc2_ndb.test:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
New test file.
mysql-test/t/lowercase_table3.test:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
Moved case sensitive file system to a specific inc-file instead of
included in lowercase0.inc
sql/ha_partition.cc:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
Problem was that ha_partition had HA_FILE_BASED set
(since it uses a .par file), but after open it uses the first partitions
table_flags(), which results in different case handling for create and for
open.
Solution was to change the underlying partition name so it was consistent.
(Only happens when lower_case_table_names = 2, i.e. Mac OS X)
sql/handler.cc:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
Renamed check_lowercase_names to get_canonical_filename, and exported it
so that ha_partition.cc can use the function.
sql/mysql_priv.h:
Bug#37402: Mysql cant read partitioned table with capital letter in the name
Renamed check_lowercase_names to get_canonical_filename, and exported it
so that ha_partition.cc can use the function.
Problem 1: tests often fail in pushbuild with a timeout when waiting
for the slave to start/stop/receive error.
Fix 1: Updated the wait_for_slave_* macros in the following way:
- The timeout is increased by a factor ten
- Refactored the macros so that wait_for_slave_param does the work for
the other macros.
Problem 2: Tests are often incorrectly written, lacking a
source include/wait_for_slave_to_[start|stop].inc.
Fix 2: Improved the chance to get it right by adding
include/start_slave.inc and include/stop_slave.inc, and updated tests
to use these.
Problem 3: The the built-in test language command
wait_for_slave_to_stop is a misnomer (does not wait for the slave io
thread) and does not give as much debug info in case of failure as
the otherwise equivalent macro
source include/wait_for_slave_sql_to_stop.inc
Fix 3: Replaced all calls to the built-in command by a call to the
macro.
Problem 4: Some, but not all, of the wait_for_slave_* macros had an
implicit connection slave. This made some tests confusing to read,
and made it more difficult to use the macro in circular replication
scenarios, where the connection named master needs to wait.
Fix 4: Removed the implicit connection slave from all
wait_for_slave_* macros, and updated tests to use an explicit
connection slave where necessary.
Problem 5: The macros wait_slave_status.inc and wait_show_pattern.inc
were unused. Moreover, using them is difficult and error-prone.
Fix 5: remove these macros.
Problem 6: log_bin_trust_function_creators_basic failed when running
tests because it assumed @@global.log_bin_trust_function_creators=1,
and some tests modified this variable without resetting it to its
original value.
Fix 6: All tests that use this variable have been updated so that
they reset the value at end of test.
mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
Replaced wait_for_slave_to_stop by include/wait_for_slave_sql_to_stop.inc
mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test:
Replaced wait_for_slave_to_stop by include/wait_for_slave_sql_to_stop.inc
Added connection slave since includ/wait_for_slave_sql_to_stop.inc
does not do that anymore.
mysql-test/extra/rpl_tests/rpl_log.test:
Replaced start slave+wait_slave_status by start_slave.inc
mysql-test/include/reset_master_and_slave.inc:
replaced start/stop slave by start_slave.inc/stop_slave.inc
mysql-test/include/sync_slave_io_with_master.inc:
Improved comments and error message.
mysql-test/include/wait_for_slave_io_to_stop.inc:
Refactored to use wait_for_slave_param.inc.
Removed connection slave.
mysql-test/include/wait_for_slave_param.inc:
- Improved usage instructions
- Added more debug info in case of timeout
- Added parameters $slave_param_comparison, $slave_timeout,
$slave_keep_connection, $slave_error_message
mysql-test/include/wait_for_slave_sql_error.inc:
Refactored to use wait_for_slave_param.inc.
Removed connection slave.
mysql-test/include/wait_for_slave_sql_to_start.inc:
Refactored to use wait_for_slave_param.inc.
Removed connection slave.
mysql-test/include/wait_for_slave_sql_to_stop.inc:
Refactored to use wait_for_slave_param.inc.
Removed connection slave.
mysql-test/include/wait_for_slave_to_start.inc:
Refactored to use wait_for_slave_param.inc.
Removed connection slave.
mysql-test/include/wait_for_slave_to_stop.inc:
Refactored to use wait_for_slave_param.inc.
Removed connection slave.
mysql-test/include/wait_show_pattern.inc:
Removed unused (and error-prone) file
mysql-test/include/wait_slave_status.inc:
Removed unused (and error-prone) file
mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test:
Renamed $keep_connection to $slave_keep_connection.
mysql-test/suite/rpl/t/rpl_bug26395.test:
Replace stop slave by stop_slave.inc
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test:
Replace start/stop slave by start_slave.inc/stop_slave.inc.
Replace wait_for_slave_param by wait_for_slave_sql_to_stop.inc.
mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
Renamed $keep_connection to $slave_keep_connection.
mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
Replace wait_slave_status by start_slave.inc
mysql-test/suite/rpl/t/rpl_idempotency.test:
Added connection slave since wait_for_slave_sql_to_stop.inc does not
do that any more.
mysql-test/suite/rpl/t/rpl_incident.test:
Replaced wait_for_slave_to_stop by wait_for_slave_sql_to_stop.inc
mysql-test/suite/rpl/t/rpl_init_slave.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
Replaced save_master_pos;connection slave;sync_with_master by
sync_slave_with_master.
mysql-test/suite/rpl/t/rpl_log_pos.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
Replaced wait_for_slave_param by other wait_for_slave_* macros.
mysql-test/suite/rpl/t/rpl_packet.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_row_until.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
Replaced save_master_pos;connection slave;sync_with_master by
sync_slave_with_master.
mysql-test/suite/rpl/t/rpl_server_id1.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_slave_grp_exec.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_slave_skip.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_slave_status.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_sp.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/suite/rpl/t/rpl_sp_effects.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/suite/rpl/t/rpl_stm_until.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
Replaced save_master_pos;connection slave;sync_with_master by
sync_slave_with_master.
mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test:
Replaced start slave by start_slave.inc.
Added explicit connection slave since wait_for_slave_sql_to_stop.inc
does not do that anymore.
mysql-test/t/disabled.def:
Disabled failing test.
mysql-test/t/func_time.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/t/grant.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/t/grant2.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/t/innodb_notembedded.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/t/log_bin_trust_function_creators_func.test:
Restore @@global.log_bin_trust_function_creators at end of test.
Clean up at end of test by dropping the created user.
mysql-test/t/query_cache.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/t/query_cache_notembedded.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/t/rpl_init_slave_func.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/t/timezone2.test:
Restore @@global.log_bin_trust_function_creators at end of test.
when resetting replication tests. If not, circular replication setups
will leave cruft in the slaves binary log.
mysql-test/include/master-slave-reset.inc:
Adding RESET MASTER on slave and RESET SLAVE on master. In order to avoid
having to re-generate all the replication test result files, I disable the
query log for the added statements.
mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
Adding code to clean up after test. Disabling query log for the cleanup code.
The problem is that relying on the output of the 'ls' command is not
portable as its behavior is not the same between systems and it might
even not be available at all in (Windows).
So I added list_files that relies on the portable mysys library instead.
(and also list_files_write_file and list_files_append_file,
since the test was using '--exec ls' in that way.)
client/mysqltest.c:
Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'
To be able to replace the use of '--exec ls' I have added
list_files, list_files_write_file and list_files_append_file.
list_files <dirname> [<filename incl. wild-cards>]
is equivalent to 'ls <dirname>/[<filename incl. wild-cards>]'
list_files_write_file creates/overwrites a file with the content
list_files_append_file creates/appends a file with the content
list_files* return a sorted output.
mysql-test/r/mysqltest.result:
Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'
result file change, due to added test of the new list_files command.
mysql-test/suite/parts/inc/partition_check_drop.inc:
Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'
Using the new list_files instead of 'ls'.
Changed the use of local variables (ls_file, file_list)
and server variable (@aux).
mysql-test/suite/parts/inc/partition_layout.inc:
Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'
Using the new list_files instead of 'ls'.
mysql-test/suite/parts/inc/partition_layout_check1.inc:
Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'
Using the new list_files instead of 'ls'.
mysql-test/suite/parts/inc/partition_layout_check2.inc:
Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'
Replaces '--exec ls' with list_files.
Removal of the directory part of file listing.
mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result:
Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'
Replaces '--exec ls' with list_files.
Removal of the directory part of file listing.
mysql-test/suite/parts/r/partition_alter1_1_myisam.result:
Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'
Replaces '--exec ls' with list_files.
Removal of the directory part of file listing.
mysql-test/suite/parts/r/partition_alter1_2_myisam.result:
Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'
Replaces '--exec ls' with list_files.
Removal of the directory part of file listing.
mysql-test/suite/parts/r/partition_alter2_myisam.result:
Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'
Replaces '--exec ls' with list_files.
Removal of the directory part of file listing.
mysql-test/suite/parts/r/partition_alter3_innodb.result:
Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'
Replaces '--exec ls' with list_files.
Removal of the directory part of file listing.
mysql-test/suite/parts/r/partition_alter3_myisam.result:
Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'
Replaces '--exec ls' with list_files.
Removal of the directory part of file listing.
mysql-test/suite/parts/r/partition_basic_innodb.result:
Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'
Replaces '--exec ls' with list_files.
Removal of the directory part of file listing.
mysql-test/suite/parts/r/partition_basic_myisam.result:
Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'
Replaces '--exec ls' with list_files.
Removal of the directory part of file listing.
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result:
Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'
Replaces '--exec ls' with list_files.
Removal of the directory part of file listing.
mysql-test/suite/parts/r/partition_engine_myisam.result:
Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'
Replaces '--exec ls' with list_files.
Removal of the directory part of file listing.
mysql-test/suite/parts/r/partition_syntax_myisam.result:
Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'
Replaces '--exec ls' with list_files.
Removal of the directory part of file listing.
mysql-test/t/mysqltest.test:
Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'
Adding test for the new mysqltest commands list_files,
list_files_write_file and list_files_append_file.
problem was that ha_partition::records was not implemented, thus
using the default handler::records, which is not correct if the engine
does not support HA_STATS_RECORDS_IS_EXACT.
Solution was to implement ha_partition::records as a wrapper around
the underlying partitions records.
The rows column in explain partitions will now include the total
number of records in the partitioned table.
(recommit after removing out-commented code)
Problem was that auto_repair, is_crashed and check_and_repair was not
implemented in ha_partition.
Solution, implemented them as loop over all partitions for is_crashed and
check_and_repair, and using the first partition for auto_repair.
(Recommit after fixing review comments)
mysql-test/lib/mtr_report.pl:
Bug#35161: --myisam-recover does not work for partitioned MyISAM tables
Added filter for crashed tables, when testing auto repair
mysql-test/std_data/corrupt_t1#P#p1.MYI:
Bug#35161: --myisam-recover does not work for partitioned MyISAM tables
Corrupt MYI file for testing auto repair
mysql-test/std_data/corrupt_t1.MYI:
Bug#35161: --myisam-recover does not work for partitioned MyISAM tables
Corrupt MYI file for testing auto repair
mysql-test/suite/parts/r/partition_repair_myisam.result:
Bug#35161: --myisam-recover does not work for partitioned MyISAM tables
Result file for testing auto repair of crashed myisam partitions
mysql-test/suite/parts/t/partition_repair_myisam-master.opt:
Bug#35161: --myisam-recover does not work for partitioned MyISAM tables
opt file for testing auto repair of crashed myisam partitions
mysql-test/suite/parts/t/partition_repair_myisam.test:
Bug#35161: --myisam-recover does not work for partitioned MyISAM tables
Test file for testing auto repair of crashed myisam partitions
sql/ha_partition.cc:
Bug#35161: --myisam-recover does not work for partitioned MyISAM tables
Added auto_repair as returning the first partitions auto_repair
Added is_crashed and check_and_repair as loop over all partitions
sql/ha_partition.h:
Bug#35161: --myisam-recover does not work for partitioned MyISAM tables
Activating check_and_repair, auto_repair and is_crashed
Problem: the test syncs slave by a 'wait_condition' waiting until
table t1 has 5000 rows. However, there is no guarantee that t1
makes it to the slave before the wait_condition.
Fix: sync_slave_with_master just after t1 was created.
mysql-test/suite/rpl/t/rpl_insert.test:
Added sync_slave_with_master to ensure that table t1 is on
slave before the slave executes wait_condition.
positions changed. Fixed by removing binlog positions from
output, and also:
- removed code not used to verify the tested property
- added comments
mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result:
Updated result file.
mysql-test/suite/rpl/t/rpl_row_inexist_tbl-slave.opt:
Removed option file: it's not needed any more.
mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test:
Improved the test in the following ways:
- The table t2 was not used to verify the property to test,
so t2 has been removed.
- Now printing only the relevant column from SHOW SLAVE STATUS
- Added comments.
Problem: rpl_ndb_transaction fails because it assumes nothing
is written to the binlog at a certain point. However, ndb may
binlog updates in ndb system tables at a nondeterministic
time point after an ndb table update has been committed.
Fix: break the test into two. rpl_ndb_transaction still does
the ndb updates needed by the first half of the test. The new
test case rpl_bug26395 includes the part that assumes nothing
more will be written to the binlog.
mysql-test/include/sync_slave_io_with_master.inc:
Like sync_slave_with_master, but only waits until the IO thread has
synced; the SQL thread may still be behind.
mysql-test/suite/rpl/r/rpl_bug26395.result:
New result file.
mysql-test/suite/rpl/t/rpl_bug26395-master.opt:
New option file.
mysql-test/suite/rpl/t/rpl_bug26395-slave.opt:
New option file.
mysql-test/suite/rpl/t/rpl_bug26395.test:
- Moved second half of rpl_ndb_transaction here.
- Improved the test case: instead of using a sleep,
it waits for the slave's io thread to sync up to a proper
position, and for the slave's sql thread to sync up to
another position.
- Added a warning that no more tests should be added at the
end of the file.
mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result:
Updated and renamed result file.
mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions-master.opt:
No need for the special debug flag any more, it was used by
the second part of the test which is now in rpl_bug26395.
Also renamed the file.
mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions-slave.opt:
Renamed option file.
mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test:
- Moved second half of the test to another test (rpl_bug26395)
- Improved comments.
- Extended the mixed transaction test to include also innodb.
- Used 'source include/diff_tables.inc' instead of listing
several identical tables in the result file.
- Renamed the test.
Problem 1: main.loaddata tried to trigger an error caused by
reading files outside the vardir, by reading itself. However,
if loaddata.test is not world-readable (e.g., umask=0077),
then another error is triggered.
Fix 1: allow the other error too.
Problem 2: rpl_slave_skip and rpl_innodb_mixed_dml tried to
copy a file from mysql-test/suite/rpl/data to mysql-test/var
and then read it. That failed too if umask=0077, since the
file would not become world-readable.
Fix 2: move the files from mysql-test/suite/rpl/data to
mysql-test/std_data and update tests accordingly. Remove
the directory mysql-test/suite/rpl/data.
mysql-test/r/loaddata.result:
Updated result file.
mysql-test/std_data/rpl_bug28618.dat:
Moved this file to std_data.
mysql-test/std_data/rpl_mixed.dat:
Moved this file to std_data.
mysql-test/suite/rpl/data:
Removed directory that is now unused.
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
The rpl_mixed.dat file has been moved. Updated the test to
use the new location.
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
Updated result file.
mysql-test/suite/rpl/r/rpl_slave_skip.result:
Updated result file.
mysql-test/suite/rpl/t/rpl_slave_skip.test:
The rpl_bug28618.dat file has been moved. Updated the test
to use the new location.
mysql-test/t/loaddata.test:
Allow more error messages. ER_TEXTFILE_NOT_READABLE may
happen if the file is not world-readable (which may happen,
e.g., if the user has umask=0077).
This bug has been fixed in two slightly different ways in
6.0-rpl and {5.1,6.0}-bugteam. To avoid future merge
problems, I'm now copying the 6.0-rpl fix to 5.1-bugteam.
The previous fix for the bug was incomplete. The test failed
because t2 did not exist on the slave (since the slave was
lagging) when the
wait_condition was executed. Fixed by inserting
sync_slave_with_master just after t2 was created.
Test was failing due to the addition of a '\x05' character in result sets
Latest builds of the server have shown this problem to have disappeared.
Removing code within the test that disables the test on Mac OS X.
Recommit due to tree error on earlier, approved patch.
REORGANIZE TEST parts WHERE ENGINE='NDB' ;)
Updated tests for better matching NDB's limitations.
Removed some duplicate tests.
mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc:
Bug#36732: many disabled ndb tests in test suite parts
Added variable for NDB (since it does not support
DROP PARTITION)
mysql-test/suite/parts/inc/partition_alter_11.inc:
Bug#36732: many disabled ndb tests in test suite parts
Assigning directly to variable without going
through the server.
mysql-test/suite/parts/inc/partition_bigint.inc:
Bug#36732: many disabled ndb tests in test suite parts
Added --sorted_result for consistency
lowered number of partitions for use with NDB
(NDB can only do maximum of 8 partitions)
mysql-test/suite/parts/inc/partition_int.inc:
Bug#36732: many disabled ndb tests in test suite parts
Added --sorted_result for consistency
lowered number of partitions for use with NDB
(NDB can only do maximum of 8 partitions)
mysql-test/suite/parts/inc/partition_mediumint.inc:
Bug#36732: many disabled ndb tests in test suite parts
Added --sorted_result for consistency
lowered number of partitions for use with NDB
(NDB can only do maximum of 8 partitions)
mysql-test/suite/parts/inc/partition_smallint.inc:
Bug#36732: many disabled ndb tests in test suite parts
Added --sorted_result for consistency
lowered number of partitions for use with NDB
(NDB can only do maximum of 8 partitions)
mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc:
Bug#36732: many disabled ndb tests in test suite parts
Made it work better with NDB
mysql-test/suite/parts/inc/partition_tinyint.inc:
Bug#36732: many disabled ndb tests in test suite parts
Added --sorted_result for consistency
lowered number of partitions for use with NDB
(NDB can only do maximum of 8 partitions)
mysql-test/suite/parts/r/ndb_blob_partition.result:
Bug#36732: many disabled ndb tests in test suite parts
Removing this duplicate test since it already
exists (and updated) in suite/ndb
mysql-test/suite/parts/r/ndb_dd_backuprestore.result:
Bug#36732: many disabled ndb tests in test suite parts
Updated result file
mysql-test/suite/parts/r/ndb_partition_error.result:
Bug#36732: many disabled ndb tests in test suite parts
Removing this duplicate test since it already
exists (and updated) in suite/ndb
mysql-test/suite/parts/r/ndb_partition_key.result:
Bug#36732: many disabled ndb tests in test suite parts
Removing this duplicate test since it already
exists (and updated) in suite/ndb
mysql-test/suite/parts/r/ndb_partition_list.result:
Bug#36732: many disabled ndb tests in test suite parts
Removing this duplicate test since it already
exists (and updated) in suite/ndb
mysql-test/suite/parts/r/ndb_partition_range.result:
Bug#36732: many disabled ndb tests in test suite parts
Removing this duplicate test since it already
exists (and updated) in suite/ndb
mysql-test/suite/parts/r/part_supported_sql_func_ndb.result:
Bug#36732: many disabled ndb tests in test suite parts
Updated result file
mysql-test/suite/parts/r/partition_alter1_1_innodb.result:
Bug#36732: many disabled ndb tests in test suite parts
Updated result file
mysql-test/suite/parts/r/partition_alter1_1_myisam.result:
Bug#36732: many disabled ndb tests in test suite parts
Updated result file
mysql-test/suite/parts/r/partition_alter1_2_innodb.result:
Bug#36732: many disabled ndb tests in test suite parts
Updated result file.
Diff bigger than necessary, due to bzr diff bug.
mysql-test/suite/parts/r/partition_alter1_2_myisam.result:
Bug#36732: many disabled ndb tests in test suite parts
Updated result file
mysql-test/suite/parts/r/partition_alter2_innodb.result:
Bug#36732: many disabled ndb tests in test suite parts
Updated result file
mysql-test/suite/parts/r/partition_alter2_myisam.result:
Bug#36732: many disabled ndb tests in test suite parts
Updated result file
mysql-test/suite/parts/r/partition_engine_ndb.result:
Bug#36732: many disabled ndb tests in test suite parts
Updated result file
mysql-test/suite/parts/r/partition_int_innodb.result:
Bug#36732: many disabled ndb tests in test suite parts
Updated result file
mysql-test/suite/parts/r/partition_int_myisam.result:
Bug#36732: many disabled ndb tests in test suite parts
Updated result file
mysql-test/suite/parts/r/partition_int_ndb.result:
Bug#36732: many disabled ndb tests in test suite parts
Updated result file
mysql-test/suite/parts/r/rpl_ndb_dd_partitions.result:
Bug#36732: many disabled ndb tests in test suite parts
Removing this duplicate test since it already
exists (and updated) in suite/rpl_ndb
mysql-test/suite/parts/t/disabled.def:
Bug#36732: many disabled ndb tests in test suite parts
Removed some duplicate tests, fixed some tests.
Removed the 'runs too long on PB' test from
disabled.def and made them to require 'big-test'.
mysql-test/suite/parts/t/ndb_blob_partition.test:
Bug#36732: many disabled ndb tests in test suite parts
Removing this duplicate test since it already
exists (and updated) in suite/ndb
mysql-test/suite/parts/t/ndb_dd_backuprestore.test:
Bug#36732: many disabled ndb tests in test suite parts
Added new=on for allowing test of
hash/range and list partitioning.
mysql-test/suite/parts/t/ndb_partition_error.test:
Bug#36732: many disabled ndb tests in test suite parts
Removing this duplicate test since it already
exists (and updated) in suite/ndb
mysql-test/suite/parts/t/ndb_partition_key.test:
Bug#36732: many disabled ndb tests in test suite parts
Removing this duplicate test since it already
exists (and updated) in suite/ndb
mysql-test/suite/parts/t/ndb_partition_list.test:
Bug#36732: many disabled ndb tests in test suite parts
Removing this duplicate test since it already
exists (and updated) in suite/ndb
mysql-test/suite/parts/t/ndb_partition_range.test:
Bug#36732: many disabled ndb tests in test suite parts
Removing this duplicate test since it already
exists (and updated) in suite/ndb
mysql-test/suite/parts/t/part_supported_sql_func_ndb.test:
Bug#36732: many disabled ndb tests in test suite parts
Added new=on for allowing test of
hash/range and list partitioning.
Added ndb restriction variables.
mysql-test/suite/parts/t/partition_alter1_1_2_ndb.test:
Bug#36732: many disabled ndb tests in test suite parts
requiring big-test instead of disable it.
mysql-test/suite/parts/t/partition_alter1_1_ndb.test:
Bug#36732: many disabled ndb tests in test suite parts
requiring big-test instead of disable it.
mysql-test/suite/parts/t/partition_alter1_2_ndb.test:
Bug#36732: many disabled ndb tests in test suite parts
requiring big-test instead of disable it.
mysql-test/suite/parts/t/partition_alter2_ndb.test:
Bug#36732: many disabled ndb tests in test suite parts
Added new=on for allowing test of
hash/range and list partitioning.
mysql-test/suite/parts/t/partition_basic_ndb.test:
Bug#36732: many disabled ndb tests in test suite parts
Added new=on for allowing test of
hash/range and list partitioning.
mysql-test/suite/parts/t/partition_bit_ndb.test:
Bug#36732: many disabled ndb tests in test suite parts
Added new=on for allowing test of
hash/range and list partitioning.
mysql-test/suite/parts/t/partition_engine_ndb.test:
Bug#36732: many disabled ndb tests in test suite parts
Added new=on for allowing test of
hash/range and list partitioning.
mysql-test/suite/parts/t/partition_int_ndb.test:
Bug#36732: many disabled ndb tests in test suite parts
Added new=on for allowing test of
hash/range and list partitioning.
mysql-test/suite/parts/t/partition_syntax_ndb.test:
Bug#36732: many disabled ndb tests in test suite parts
Added new=on for allowing test of
hash/range and list partitioning.
mysql-test/suite/parts/t/partition_value_ndb.test:
Bug#36732: many disabled ndb tests in test suite parts
Added new=on for allowing test of
hash/range and list partitioning.
mysql-test/suite/parts/t/rpl_ndb_dd_partitions.test:
Bug#36732: many disabled ndb tests in test suite parts
Removing this duplicate test since it already
exists (and updated) in suite/rpl_ndb
Bug#36787 Test funcs_1.charset_collation_1 failing
Details:
1. Skip charset_collation_1 if charset "ucs2_bin" is
missing (property which distincts "vanilla" builds
from the others)
2. Let builds with version_comment LIKE "%Advanced%"
(found them for 5.1) execute charset_collation_3.
3. Update comments charset_collation.inc so that they
reflect the current experiences.
In order to handle CHAR() fields, 8 bits were reserved for
the size of the CHAR field. However, instead of denoting the
number of characters in the field, field_length was used which
denotes the number of bytes in the field.
Since UTF-8 fields can have three bytes per character (and
has been extended to have four bytes per character in 6.0),
an extra two bits have been encoded in the field metadata
work for fields of type Field_string (i.e., CHAR fields).
Since the metadata word is filled, the extra bits have been
encoded in the upper 4 bits of the real type (the most
significant byte of the metadata word) by computing the
bitwise xor of the extra two bits. Since the upper 4 bits
of the real type always is 1111 for Field_string, this
means that for fields of length <256, the encoding is
identical to the encoding used in pre-5.1.26 servers, but
for lengths of 256 or more, an unrecognized type is formed,
causing an old slave (that does not handle lengths of 256
or more) to stop.
mysql-test/extra/rpl_tests/rpl_row_basic.test:
Adding test cases for replicating UTF-8 fields of lengths
of 256 or more (bytes).
mysql-test/suite/binlog/r/binlog_base64_flag.result:
Result file change.
mysql-test/suite/binlog/t/binlog_base64_flag.test:
Adding tests to trigger check that an error is generated when replicating from a
5.1.25 server for tables with a CHAR(128) but not when replicating a table with a
CHAR(63). Although the bug indicates that the limit is 83, we elected to use CHAR(63)
since 6.0 uses 4-byte UTF-8, and anything exceeding 63 would then cause the test to fail
when the patch is merged to 6.0.
mysql-test/suite/bugs/combinations:
Adding combinations file to run all bug reports in all binlog modes (where
applicable).
mysql-test/suite/bugs/r/rpl_bug37426.result:
Result file change.
mysql-test/suite/bugs/t/rpl_bug37426.test:
Added test for reported bug.
mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result:
Result file change.
mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result:
Result file change.
sql/field.cc:
Encoding an extra two bits in the most significant nibble (4 bits)
of the metadata word. Adding assertions to ensure that no attempt
is made to use lengths longer than supported.
Extending compatible_field_size() function with an extra parameter
holding a Relay_log_instace for error reporting.
Field_string::compatible_field_size() now reports an error if field
size for a CHAR is >255.
sql/field.h:
Field length is now computed from most significant 4 bits
of metadata word, or is equal to the row pack length if
there is no metadata.
Extending compatible_field_size() function with an extra parameter
holding a Relay_log_instace for error reporting.
sql/rpl_utility.cc:
Adding relay log parameter to compatible_field_size().
Minor refactoring to eliminate duplicate code.
sql/slave.cc:
Extending rpl_master_has_bug() with a single-argument predicate function and
a parameter to the predicate function. The predicate function can be used to
test for extra conditions for the bug before writing an error message.
sql/slave.h:
Extending rpl_master_has_bug() with a single-argument predicate function and
a parameter to the predicate function. The predicate function can be used to
test for extra conditions for the bug before writing an error message.
Also removing gratuitous default argument.
sql/sql_insert.cc:
Changing calls to rpl_master_has_bug() to adapt to changed signature.
Problem: rpl_switch_stm_row_mixed did not wait until row events generated by
INSERT DELAYED were written to the master binlog before it synchronized slave
with master. This caused sporadic errors where these rows were missing on
slave.
Fix: wait until all rows appear on the slave.
This is a backport, applying the same to 5.1-bugteam as was previously
applied to 6.0-rpl
The crash appeared to be a result of allocating an instance of Discrete_interval
automatically that that was referred in out-of-declaration scope.
Fixed with correcting backing up and restoring scheme of
auto_inc_intervals_forced, introduced by bug#33029, by means of shallow copying;
added simulation code that forces executing those fixes of the former bug that
targeted at master-and-slave having incompatible bug#33029-prone versions.
mysql-test/suite/bugs/r/rpl_bug33029.result:
new results file
mysql-test/suite/bugs/t/rpl_bug33029.test:
test merely checks no crash happens on slave.
sql/slave.cc:
forcing to execute special logics implemented for bug#33029 if
simulate_bug33029 the debug option is set.
sql/sql_class.cc:
swaps of backed and the actual auto_inc_intervals_forced basing on shallow coping.
sql/structs.h:
Removing the deep _copy() and methods associated with it;
adding methods to Discrete_intervals_list:
private `=', copy constructor to prevent using;
private set_members();
public copy_shallow(), swap(), get_{head, tail, current}();
empty_no_free() through set_members().
replicated correctly between machines with
mixed endiannes
mysql-test/extra/rpl_tests/rpl_row_basic.test:
Added regression test for bug#37076.
mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result:
Added regression test for bug#37076.
mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result:
Added regression test for bug#37076.
mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
Added regression test for bug#37076.
sql/field.h:
Fixed bug #37076: TIMESTAMP/DATETIME/DATE values are not
replicated correctly between machines with
mixed endiannes
pack and unpack virtual methods have been overloaded for
Field_timestamp (TIMESTAMP domain), Field_datetime (DATETIME
domain) and Field_date (DATE domain) classes to replicate data
between platforms with different endiannes in a correct way
like in Field_long and Field_longlong classes.
Common code have been moved to private handle_int32 and
handle_int64 private methods.
On a slow environment like valgrind the test is vulnerable
because it does not check if slave has stopped at time
of the new session is requested `start slave;' -- disabling
test till it is fixed.
mysql-test/suite/rpl/t/disabled.def:
disable rpl_server_id1 until test is fixed.
37167 funcs_1: Many tests fail if the embedded
server is used.
37164 funcs_1: Some tests fail if an optional
character set is missing.
+ some cleanup within the testsuite related to the
fixes above
+ some adjustments to open bugs on Mac OS X
2. Skip tests which suffer from bug
37456 funcs_1: Several tests crash when used
with embedded server
3. Minor cleanup in some tests
Bug#37167 funcs_1: Many tests fail if the embedded server is used.
Bug#37164 funcs_1: Some tests fail if an optional character set is missing.
+ some cleanup within the testsuite related to the fixes above
+ some adjustments to open bugs on Mac OS X
Details:
- Remove the initial loading of data from tests if these data
are not somewhere retrieved
- Remove any use of columns with attribute unicode
(-> UCS2 is no more needed) from tests where unicode
properties are not checked or somehow required
- Create a separate branch of the Character maximum length test
(CML). If UCS2 is available than this test gets applied to
every available type of string column with attribute unicode
This prevents any loss of coverage by the points above.
- Disable the execution of is_tables_ndb which gives wrong
results because of a bug. Correct the exepected results of
this test.
- In case of tests failing when applied to the embedded server
1) Create a variant of this test for the embedded server
or
2) Skip the test in case of embedded server
depending on purpose and complexity of test.
- Skip the tests which could suffer from
Bug 28309 First insert violates unique constraint - was "memory" table empty ?
Bug 37380 Test funcs_1.is_columns_myisam_embedded fails on OS X
(both bugs Mac OS X, embedded server, MySQL 5.0 only)
- Minor improvements like remove typos
Fix for this bug and additional improvements/fixes
In detail:
- Remove unicode attribute from several columns
(unicode properties were nowhere needed/tested)
of the table tb3
-> The runnability of these tests depends no more on
the availibility of some optional collations.
- Use a table tb3 with the same layout for all
engines to be tested and unify the engine name
within the protocols.
-> <engine>_trig_<abc>.result have the same content
- Do not load data into tb3 if these rows have no
impact on result sets
- Add tests for NDB (they exist already in 5.1)
- "--replace_result" at various places because
NDB variants of tests failed with "random" row
order in results
This fixes a till now unknown weakness within the
funcs_1 NDB tests existing in 5.1 and 6.0
- Fix the expected result of ndb_trig_1011ext
which suffered from Bug 32656
+ disable this test
- funcs_1 could be executed with the mysql-test-run.pl
option "--reorder", which saves some runtime by
optimizing server restarts.
Runtimes on tmpfs (one attempt only):
with reorder 132 seconds
without reorder 183 seconds
- Adjust two "check" statements within func_misc.test
which were incorrect (We had one run with result set
difference though the server worked good.)
- minor fixes in comments
Bug#36724 - Test funcs_1.<engine>_storedproc_02 needs to be updated
Bug#36726 - Test funcs_1.<engine>_storedproc failing - Needs to be updated on 5.1+
func_view bug: re-records .result files to account for addition of charset and collation data
to SHOW CREATE VIEW output
storedproc bugs: Added expected errors for those storedprocs that use SQLSTATE:00000
in their handlers. re-recorded .result files to account for these
expected errors.
mysql-test/suite/funcs_1/r/innodb_func_view.result:
Update result set for changes to SHOW CREATE VIEW output
mysql-test/suite/funcs_1/r/memory_func_view.result:
Updated result set due to changes in SHOW CREATE VIEW output
mysql-test/suite/funcs_1/r/myisam_func_view.result:
Updated result set due to changes in SHOW CREATE VIEW output
rpl_slave_status failed on pushbuild. The slave stopped with an
error. Adding sync_slave_with_master fixes the problem. Updated
test case.
mysql-test/suite/rpl/r/rpl_slave_status.result:
Updated result file.
mysql-test/suite/rpl/t/rpl_slave_status.test:
- Added comment explaining what the test does.
- Added sync_slave_with_master in two places where it was missing. This
caused sporadic pushbuild errors.
- Added wait_for_slave_to_{start,stop} after {START,STOP} SLAVE queries.
- Removed 'drop table if exists' from setup code.
- Replaced save_master_pos;connection slave;sync_with_master by
sync_slave_with_master.
- Replaced 'delete from mysql.user' by 'drop user'.
- Wrapped 'show slave status' inside query_get_value(), so that only what
we test is in the output.
The test is vulnerable because it does not check if slave has stopped at time
of the new session is requested `start slave;'
Fixed with deploying explicitly wait_for_slave_to_stop synchronization macro.
into magare.gmz:/home/kgeorge/mysql/work/B36011-5.1-bugteam
sql/sql_select.cc:
Auto merged
mysql-test/r/subselect.result:
merge of bug 36011 to 5.1-bugteam
mysql-test/t/subselect.test:
merge of bug 36011 to 5.1-bugteam
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570
mysql-test/suite/rpl/t/rpl_sp.test:
Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
Use local. Needs re-recording.
mysql-test/r/ctype_cp932_binlog_stm.result:
New offsets because of quote marks.
mysql-test/r/mysqlbinlog.result:
Re-add variables removed in merge at file-vers 1.47.
mysql-test/suite/binlog/r/binlog_database.result:
create_string() output changes the quoting and inserts newlines.
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
Change in quoting.
mysql-test/suite/rpl/r/rpl_sp.result:
Adds quotes and newlines in creation of routines in binlog.
mysql-test/extra/rpl_tests/rpl_insert_id.test:
Moving save and restore of @@global.concurrent_insert into the same
session thread.
mysql-test/suite/rpl/r/rpl_insert_id.result:
Result file change.
mysql-test/suite/rpl/t/rpl_insert_id.test:
***MISSING TEXT***
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570
mysql-test/suite/rpl/t/rpl_sp.test:
Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
manual merge.
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570
BitKeeper/deleted/.del-binlog_innodb.result:
Auto merged
sql/sp_head.cc:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
need to re-record.
mysql-test/suite/rpl/r/rpl_sp.result:
need to re-record.
mysql-test/r/mysqlbinlog.result:
manual merge.
mysql-test/suite/rpl/t/rpl_sp.test:
manual merge.
sql/sp.cc:
manual merge.
sql/sp_head.h:
manual merge.
Problem: If INSERT is immediately followed by SELECT in another thread,
the newly inserted rows may not be returned by the SELECT statement, if
ENGINE=myisam and @@concurrent_insert=1. This caused sporadic errors in
rpl_insert_id.
Fix: The test now uses ENGINE=$engine_type when creating tables (so that
innodb is used). It also turns off @@concurrent_insert around the critical
place, so that it works if someone in the future writes a test that sets
$engine_type=myisam before sourcing extra/rpl_tests/rpl_insert_id.test.
It also adds ORDER BY to all SELECTs so that the result is deterministic.
mysql-test/extra/rpl_tests/rpl_insert_id.test:
- Use ENGINE=$engine_type when creating tables, since that's expected by
suite/rpl/t/rpl_insert_id.test.
- Use ORDER BY to avoid nondeterministic results from SELECT.
- Set @@concurrent_insert=0 before doing SELECT after INSERT in another
client.
mysql-test/suite/rpl/r/rpl_insert_id.result:
Update result file.
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570
BitKeeper/deleted/.del-binlog_innodb.result:
Auto merged
mysql-test/r/mysqlbinlog.result:
need to record.
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
need to record.
mysql-test/suite/rpl/r/rpl_sp.result:
need to record.
mysql-test/suite/rpl/t/rpl_sp.test:
manual merge.
sql/sp.cc:
Manual merge
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_views.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
Auto merged
mysql-test/suite/funcs_1/r/myisam_views.result:
merge of 5.1 to 5.1-bugteam
into mysql.com:/home/kent/bk/mysql-5.1
BUILD/Makefile.am:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/std_data/funcs_1/innodb_tb1.txt:
Auto merged
mysql-test/std_data/funcs_1/innodb_tb2.txt:
Auto merged
mysql-test/std_data/funcs_1/innodb_tb3.txt:
Auto merged
mysql-test/std_data/funcs_1/innodb_tb4.txt:
Auto merged
mysql-test/std_data/funcs_1/memory_tb1.txt:
Auto merged
mysql-test/std_data/funcs_1/memory_tb2.txt:
Auto merged
mysql-test/std_data/funcs_1/memory_tb3.txt:
Auto merged
mysql-test/std_data/funcs_1/memory_tb4.txt:
Auto merged
mysql-test/std_data/funcs_1/myisam_tb1.txt:
Auto merged
mysql-test/std_data/funcs_1/myisam_tb2.txt:
Auto merged
mysql-test/std_data/funcs_1/myisam_tb3.txt:
Auto merged
mysql-test/std_data/funcs_1/myisam_tb4.txt:
Auto merged
mysql-test/std_data/funcs_1/t3.txt:
Auto merged
mysql-test/std_data/funcs_1/t4.txt:
Auto merged
mysql-test/std_data/funcs_1/t7.txt:
Auto merged
mysql-test/std_data/funcs_1/t9.txt:
Auto merged
mysql-test/suite/funcs_1/README.txt:
Auto merged
mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
Auto merged
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
Auto merged
mysql-test/suite/funcs_1/include/innodb_tb1.inc:
Auto merged
mysql-test/suite/funcs_1/include/innodb_tb2.inc:
Auto merged
mysql-test/suite/funcs_1/include/innodb_tb3.inc:
Auto merged
mysql-test/suite/funcs_1/include/innodb_tb4.inc:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb1.inc:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb2.inc:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb3.inc:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb4.inc:
Auto merged
mysql-test/suite/funcs_1/include/myisam_tb1.inc:
Auto merged
mysql-test/suite/funcs_1/include/myisam_tb2.inc:
Auto merged
mysql-test/suite/funcs_1/include/myisam_tb3.inc:
Auto merged
mysql-test/suite/funcs_1/include/myisam_tb4.inc:
Auto merged
mysql-test/suite/funcs_1/include/sp_tb.inc:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0407.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_trig_1011ext.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_views.result:
Auto merged
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
Auto merged
mysql-test/suite/funcs_1/r/is_columns_memory.result:
Auto merged
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
Auto merged
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_03.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0407.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_trig_1011ext.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0407.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/r/myisam_trig_1011ext.result:
Auto merged
mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
Auto merged
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
Auto merged
mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
Auto merged
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
Auto merged
mysql-test/suite/funcs_1/triggers/triggers_03.inc:
Auto merged
mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
Auto merged
mysql-test/suite/funcs_1/triggers/triggers_08.inc:
Auto merged
mysql-test/suite/funcs_1/triggers/triggers_09.inc:
Auto merged
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
Auto merged
mysql-test/suite/funcs_1/views/func_view.inc:
Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
Auto merged
When flushing tables, there were a slight chance that the flush was occuring
between processing of two table map events. Since the tables are opened
one by one, it might result in that the tables were not valid and that sub-
sequent locking of tables would cause the slave to crash.
The problem is solved by opening and locking all tables at once using
simple_open_n_lock_tables(). Also, the patch contain a change to open_tables()
so that pre-locking only takes place when the trg_event_map is not zero, which
was not the case before (this caused the lock to be placed in thd->locked_tables
instead of thd->lock since the assumption was that triggers would be called
later and therefore the tables should be pre-locked).
mysql-test/suite/rpl/r/rpl_found_rows.result:
Result change
mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result:
Result change
mysql-test/suite/rpl/t/rpl_found_rows.test:
Adding drop of table that was created in test.
mysql-test/suite/rpl/t/rpl_slave_status.test:
Adding waits for slave start and stop to ensure that test works.
sql/log_event.cc:
Replacing table-by-table open and lock with a single call
to simple_open_n_lock_tables(), which in turn required some
changes to other code.
sql/log_event_old.cc:
Replacing table-by-table open and lock with a single call
to simple_open_n_lock_tables(), which in turn required some
changes to other code.
sql/sql_base.cc:
Extending check inside open_tables() so that pre-locking in only done if
tables->trg_egent_map is non-zero.
mysql-test/include/wait_for_slave_sql_to_start.inc:
New BitKeeper file ``mysql-test/include/wait_for_slave_sql_to_start.inc''
test change for 5.1+ (show create view adds two columns in 5.1)
Patch only for 5.1+
mysql-test/suite/rpl/r/rpl_sp.result:
restored the original 5.1 test result
mysql-test/suite/rpl/r/rpl_view.result:
Bug#32575: Parse error of stmt with extended comments on slave side
Updated test result for show create view in 5.0 to 5.1
into client-10-129-10-147.upp.off.mysql.com:/Users/mattiasj/clones/topush-51-bugteam
mysql-test/suite/rpl/r/rpl_sp.result:
Auto merged
mysql-test/suite/rpl/t/rpl_view.test:
Auto merged
sql/sql_view.cc:
This was already fixed in 5.1
mysql-test/suite/rpl/r/rpl_view.result:
manual merge
Temporarily checking in an incorrect test case. Rationale: the impact of
this bug is negligible (it's almost a feature request). We need 5.1 to be
stable, and making a real fix is a bit risky. So the fix is postponed
to 6.0.
mysql-test/suite/rpl/r/rpl_ddl.result:
Updated result file.
mysql-test/suite/rpl/t/disabled.def:
Enabling test case rpl_ddl.test
The test suite/rpl/t/rpl_innodb_bug28430.test was disabled because of
BUG#32247, but not re-enabled when BUG#32247 was fixed. I've re-enabled
it. The test and result file needed to be updated too.
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
Updated result file.
mysql-test/suite/rpl/t/disabled.def:
Enabled the rpl_innodb_bug28430 test case.
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
show slave status is not needed since we have select count(*)
The problem is that the patch for Bug 33464 didn't update the
results of the test cases which caused the problem.
Dropping a stored routine also revoke privileges for all users
on the stored routine and errors about missing grants are converted
into warnings. Before Bug 33464 such errors could be incorrectly
returned to the user, which would later trigger a assertion due to
multiple errors being set.
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/r/ndb_storedproc_06.result:
Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
Add comment regarding bug revealed by test case.
mysql-test/suite/funcs_1/t/disabled.def:
Re-enable test cases, bug has been fixed.
Bug#31237 Test "ndb_views" fails because of differing order of select results
mysql-test/suite/funcs_1/r/innodb_views.result:
Updated results
mysql-test/suite/funcs_1/r/memory_views.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
Updated results
mysql-test/suite/funcs_1/r/ndb_views.result:
Updated results
mysql-test/suite/funcs_1/views/views_master.inc:
Mangle the row numbers
Select of the test could not perform deterministically, because the table remains to be
updatable by the running event handler.
Fixed with changing verification to use a logical values instead of comparison
with a pre-recorded results.
mysql-test/include/rpl_events.inc:
changing verification to use a logical values instead of comparison with a pre-recorded
results
mysql-test/suite/rpl/r/rpl_events.result:
resutls updated.
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/suite/funcs_1/datadict/processlist_val.inc:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/suite/rpl/t/disabled.def:
SCCS merged
into ramayana.hindu.god:/home/tsmith/m/bk/bugteam/mrg/51
mysql-test/suite/rpl/r/rpl_packet.result:
Auto merged
mysql-test/suite/rpl/t/rpl_packet.test:
Auto merged
mysql-test/suite/rpl/t/disabled.def:
SCCS merged
Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
Bug#36034 - Test parts.part_supported_sql_func_<eng> fails on Windows
Bug#36036 - Test parts.partition_alter1_<eng> fails on Windows
Bug#36037 - Test parts.partition_alter2_<eng> fails on Windows
Bug#36038 - Test parts.partition_basic_<engine> failing on Windows
Bug#36039 - Test parts.partition_engine_<eng> fails on Windows
Bug#36040 - Test parts.partition_syntax_<eng> fails on Windows
Changeset to fix multiple 5.1.24-rc build bugs on Windows platforms.
Many of these bugs had the same root causes.
mysql-test/mysql-test-run.pl:
Bug#36034 - Test parts.partition_supported_sql_func_<eng> fails on Windows
Kent suggested these changes to ensure all contents of mysql-test/std_data are copied to std_data_ln on Windows (no symlinks)
mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows
Altered .inc file to include HOST column in the --replace_column clauses.
Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
mysql-test/suite/funcs_1/datadict/processlist_val.inc:
Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
Altered .inc file to include HOST column in the --replace_column clauses.
Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result:
Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows
Altered .inc file to include HOST column in the --replace_column clauses.
Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
-reran .result file to account for change in --replace_column calls
mysql-test/suite/funcs_1/r/processlist_priv_ps.result:
Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows
Altered .inc file to include HOST column in the --replace_column clauses.
Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
-reran .result file to account for change in --replace_column calls
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result:
Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
Altered .inc file to include HOST column in the --replace_column clauses.
Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
Reran .result file to account for changes to --replace_column clauses
mysql-test/suite/funcs_1/r/processlist_val_ps.result:
Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
Altered .inc file to include HOST column in the --replace_column clauses.
Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
Reran .result file to account for changes to --replace_column clauses
mysql-test/suite/parts/inc/partition_layout_check1.inc:
Bug#36036 - Test parts.partition_alter1_<eng> fails on Windows
Bug#36037 - Test parts.partition_alter2_<eng> fails on Windows
Bug#36038 - Test parts.partition_basic_<engine> failing on Windows
Bug#36039 - Test parts.partition_engine_<eng> fails on Windows
Bug#36040 - Test parts.partition_syntax_<eng> fails on Windows
Added replace_result clause to account for Windows' use of '\r' vs. '\n'
This difference was causing failures on Windows.
Also, mleich added some changes to remove some -ls clauses that weren't necessary
mysql-test/suite/parts/inc/partition_layout_check2.inc:
Bug#36036 - Test parts.partition_alter1_<eng> fails on Windows
Bug#36037 - Test parts.partition_alter2_<eng> fails on Windows
Bug#36038 - Test parts.partition_basic_<engine> failing on Windows
Bug#36039 - Test parts.partition_engine_<eng> fails on Windows
Bug#36040 - Test parts.partition_syntax_<eng> fails on Windows
Added replace_result clause to account for Windows' use of '\r' vs. '\n'
This difference was causing failures on Windows.
Also, mleich added some changes to remove some -ls clauses that weren't necessary
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result:
changes by mleich to remove unneeded use of -ls clause in .result file
These clauses were removed from partition_layout_check1.inc and partition_layout_check2.inc
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result:
updated result
mysql-test/suite/rpl_ndb/t/disabled.def:
updated disabled list
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test:
updated test
mysql-test/include/circular_rpl_for_4_hosts_init.inc:
The primitive for 4 hosts non-cluster circular replication
mysql-test/include/circular_rpl_for_4_hosts_sync.inc:
The primitive for sync for 4 hosts non-cluster circular replication
mysql-test/include/ndb_master-slave_2ch.inc:
The primitive for initialization of two-channel cluster replication
mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result:
Result file
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-master.opt:
Options file
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-slave.opt:
Options file
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test:
The test case for non-cluster circular replication A->B->C->D->A
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result:
Result file
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-master.opt:
Options file
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-slave.opt:
Options file
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test:
The test case for cluster circular replication by two channels
mysql-test/suite/rpl/r/rpl_slave_grp_exec.result:
result file
mysql-test/suite/rpl/t/rpl_slave_grp_exec-master.opt:
master option file
mysql-test/suite/rpl/t/rpl_slave_grp_exec-slave.opt:
slave option file
mysql-test/suite/rpl/t/rpl_slave_grp_exec.test:
test case
