mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 14:02:32 +01:00
06fb8c2d10
Refactoring code to add parameter to pack() and unpack() functions with purpose of indicating if data should be packed in little-endian or native order. Using new functions to always pack data for binary log in little-endian order. The purpose of this refactoring is to allow proper implementation of endian-agnostic pack() and unpack() functions. Eliminating several versions of virtual pack() and unpack() functions in favor for one single virtual function which is overridden in subclasses. Implementing pack() and unpack() functions for some field types that packed data in native format regardless of the value of the st_table_share::db_low_byte_first flag. The field types that were packed in native format regardless are: Field_real, Field_decimal, Field_tiny, Field_short, Field_medium, Field_long, Field_longlong, and Field_blob. Before the patch, row-based logging wrote the rows incorrectly on big-endian machines where the storage engine defined its own low_byte_first() to be FALSE on big-endian machines (the default is TRUE), while little-endian machines wrote the fields in correct order. The only known storage engine that does this is NDB. In effect, this means that row-based replication from or to a big-endian machine where the table was using NDB as storage engine failed if the other engine was either non-NDB or on a little-endian machine. With this patch, row-based logging is now always done in little-endian order, while ORDER BY uses the native order if the storage engine defines low_byte_first() to return FALSE for big-endian machines. In addition, the max_data_length() function available in Field_blob was generalized to the entire Field hierarchy to give the maximum number of bytes that Field::pack() will write. mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test: Sorting by columns that produces deterministic order. mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result: Result change. mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result: Result change. mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result: Result change. mysql-test/suite/rpl/t/disabled.def: Enabling tests. mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test: Adding missing sync_slave_with_master causing slave to keep tables after shutdown. mysql-test/suite/rpl_ndb/t/disabled.def: Enabling tests. mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt: Adding --new option mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test: Adding have_log_bin. mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt: Adding --new option mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test: Adding have_log_bin mysql-test/t/partition.test: Adding have_archive, since that is used in the test. sql/field.cc: Eliminating all two-argument pack() and unpack() functions and moving functionality into the four-argument version. The four argument version is introduced so that it is possible to avoid using the storage engine default when writing and reading the packed format (the unpacked format still uses the storage engine's default). This is used by row-based replication to write the fields in a storage engine- and endian-agnostic format. Packing integral and floating-point numbers in little-endian format (if requested). Using pad_char for the field instead of spaces (0x20) when unpacking. Adding some Doxygen documentation. --- Adding max_data_length() to denote the maximum number of bytes that pack() will write. Adding casts to remove warnings for debug printouts. sql/field.h: Eliminating all virtual pack() and unpack() functions except the four- argument version, which now is the function that shall be overridden. The two-argument versions are convenience functions, to prevent changes to code that uses these. Adding code to pack integer numbers and floating-point numbers in little-endian format, if requested. --- Adding max_data_length() to denote the maximum number of bytes that pack() will write. sql/log.cc: Removing debug printout causing crash when starting NDB on Solaris. sql/log_event.cc: Adding missing #ifndef causing compile failure. Adding debug printouts. sql/rpl_record.cc: Debriding code. Using new pack() and unpack() functions to always pack fields little-endian. Adding debug printouts. --- Using max_data_length() when packing field into row. Adding casts to debug printouts. sql/sql_show.cc: Adding code that causes crash on Solaris machines since printf() cannot handle NULL values for strings properly. mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result: New BitKeeper file ``mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result'' mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result: New BitKeeper file ``mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result''
349 lines
10 KiB
Text
349 lines
10 KiB
Text
##################################################################
|
||
# Author: JBM #
|
||
# Date: 2006-02-22 #
|
||
# Purpose: To test changes to mysqlbinlog for row based bin logs #
|
||
# We are using .opt file since we need small binlog size #
|
||
##################################################################
|
||
# Include Section
|
||
# Make sure that we have row based bin log
|
||
-- source include/have_binlog_format_row.inc
|
||
# Embedded server doesn't support binlogging
|
||
-- source include/not_embedded.inc
|
||
-- source include/master-slave.inc
|
||
# This test requires the cp932 charset compiled in
|
||
-- source include/have_cp932.inc
|
||
|
||
# Setup Section
|
||
# we need this for getting fixed timestamps inside of this test
|
||
|
||
--disable_query_log
|
||
select "---Setup Section --" as "";
|
||
--enable_query_log
|
||
|
||
set timestamp=1000000000;
|
||
|
||
--disable_warnings
|
||
DROP TABLE IF EXISTS t1,t2,t3;
|
||
--enable_warnings
|
||
|
||
connection master;
|
||
CREATE TABLE t1(word VARCHAR(20));
|
||
CREATE TABLE t2(id INT AUTO_INCREMENT NOT NULL PRIMARY KEY);
|
||
CREATE TABLE t3(c1 INT NOT NULL PRIMARY KEY, c2 LONGBLOB, c3 TIMESTAMP, c4 TEXT, c5 FLOAT);
|
||
|
||
|
||
# Test Section
|
||
# Lets start by putting some data into the tables.
|
||
|
||
--disable_query_log
|
||
INSERT INTO t1 VALUES ("abirvalg");
|
||
LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;
|
||
LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;
|
||
LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;
|
||
LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;
|
||
LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;
|
||
|
||
# d1 length 3000
|
||
set @d1 = 'dd1';
|
||
set @d1 = concat(@d1,@d1,@d1,@d1,@d1,@d1,@d1,@d1,@d1,@d1);
|
||
set @d1 = concat(@d1,@d1,@d1,@d1,@d1,@d1,@d1,@d1,@d1,@d1);
|
||
set @d1 = concat(@d1,@d1,@d1,@d1,@d1,@d1,@d1,@d1,@d1,@d1);
|
||
|
||
let $count=500;
|
||
while ($count)
|
||
{
|
||
INSERT INTO t2 VALUES (NULL);
|
||
eval INSERT INTO t3 VALUES ($count,@d1,'20060222000000','Tested in Texas',$count*2.2);
|
||
dec $count;
|
||
}
|
||
--enable_query_log
|
||
|
||
|
||
--disable_query_log
|
||
select "---Test1 check table load --" as "";
|
||
--enable_query_log
|
||
|
||
# Lets Check the tables on the Master
|
||
SELECT COUNT(*) from t1;
|
||
SELECT COUNT(*) from t2;
|
||
SELECT COUNT(*) from t3;
|
||
SELECT * FROM t1 ORDER BY word LIMIT 5;
|
||
SELECT * FROM t2 ORDER BY id LIMIT 5;
|
||
SELECT c1, c3, c4, c5 FROM t3 ORDER BY c1 LIMIT 5;
|
||
|
||
# Should have the same on the slave;
|
||
|
||
sync_slave_with_master;
|
||
SELECT COUNT(*) from t1;
|
||
SELECT COUNT(*) from t2;
|
||
SELECT COUNT(*) from t3;
|
||
SELECT * FROM t1 ORDER BY word LIMIT 5;
|
||
SELECT * FROM t2 ORDER BY id LIMIT 5;
|
||
SELECT c1, c3, c4, c5 FROM t3 ORDER BY c1 LIMIT 5;
|
||
|
||
# Okay time to get busy, back to master
|
||
|
||
connection master;
|
||
|
||
# simple query to show more in second binlog
|
||
insert into t1 values ("Alas");
|
||
flush logs;
|
||
|
||
# delimiters are for easier debugging in future
|
||
--disable_query_log
|
||
select "--- Test 1 Dump binlog to file --" as "";
|
||
--enable_query_log
|
||
|
||
#
|
||
# Prepare local temporary file to recreate what we have currently.
|
||
|
||
--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/master.sql
|
||
|
||
--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000002 >> $MYSQLTEST_VARDIR/tmp/master.sql
|
||
|
||
# Now that we have our file, lets get rid of the current database.
|
||
# Cleanup the master and the slave and try to recreate.
|
||
--disable_query_log
|
||
select "--- Test 1 delete tables, clean master and slave --" as "";
|
||
--enable_query_log
|
||
|
||
DROP TABLE t1;
|
||
DROP TABLE t2;
|
||
DROP TABLE t3;
|
||
|
||
sync_slave_with_master;
|
||
#we expect STOP SLAVE to produce a warning as the slave is stopped
|
||
#(the server was started with skip-slave-start)
|
||
--disable_warnings
|
||
stop slave;
|
||
--enable_warnings
|
||
--require r/slave-stopped.result
|
||
show status like 'Slave_running';
|
||
connection master;
|
||
reset master;
|
||
connection slave;
|
||
reset slave;
|
||
start slave;
|
||
--require r/slave-running.result
|
||
show status like 'Slave_running';
|
||
connection master;
|
||
|
||
# We should be clean at this point, now we will run in the file from above.
|
||
--disable_query_log
|
||
select "--- Test 1 Load from Dump binlog file --" as "";
|
||
--enable_query_log
|
||
|
||
--exec $MYSQL -e "source $MYSQLTEST_VARDIR/tmp/master.sql"
|
||
|
||
--disable_query_log
|
||
select "--- Test 1 Check Load Results --" as "";
|
||
--enable_query_log
|
||
|
||
# Lets Check the tables on the Master
|
||
SELECT COUNT(*) from t1;
|
||
SELECT COUNT(*) from t2;
|
||
SELECT COUNT(*) from t3;
|
||
SELECT * FROM t1 ORDER BY word LIMIT 5;
|
||
SELECT * FROM t2 ORDER BY id LIMIT 5;
|
||
SELECT c1, c3, c4, c5 FROM t3 ORDER BY c1 LIMIT 5;
|
||
|
||
# Should have the same on the slave;
|
||
|
||
sync_slave_with_master;
|
||
SELECT COUNT(*) from t1;
|
||
SELECT COUNT(*) from t2;
|
||
SELECT COUNT(*) from t3;
|
||
SELECT * FROM t1 ORDER BY word LIMIT 5;
|
||
SELECT * FROM t2 ORDER BY id LIMIT 5;
|
||
SELECT c1, c3, c4, c5 FROM t3 ORDER BY c1 LIMIT 5;
|
||
connection master;
|
||
|
||
# We should be gold by the time, so I will get rid of our file.
|
||
|
||
--exec rm $MYSQLTEST_VARDIR/tmp/master.sql
|
||
|
||
|
||
# this test for position option
|
||
# By setting this position to 413, we should only get the create of t3
|
||
--disable_query_log
|
||
select "--- Test 2 position test --" as "";
|
||
--enable_query_log
|
||
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||
--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=416 $MYSQLTEST_VARDIR/log/master-bin.000001
|
||
|
||
# These are tests for remote binlog.
|
||
# They should return the same as previous test.
|
||
|
||
--disable_query_log
|
||
select "--- Test 3 First Remote test --" as "";
|
||
--enable_query_log
|
||
|
||
# This is broken now
|
||
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||
--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
|
||
|
||
# This part is disabled due to bug #17654
|
||
|
||
--disable_query_log
|
||
select "--- Test 4 Second Remote test --" as "";
|
||
--enable_query_log
|
||
--exec $MYSQL_BINLOG --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 > $MYSQLTEST_VARDIR/tmp/remote.sql
|
||
|
||
--exec $MYSQL_BINLOG --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 >> $MYSQLTEST_VARDIR/tmp/remote.sql
|
||
|
||
# Now that we have our file, lets get rid of the current database.
|
||
# Cleanup the master and the slave and try to recreate.
|
||
|
||
DROP TABLE t1;
|
||
DROP TABLE t2;
|
||
DROP TABLE t3;
|
||
|
||
sync_slave_with_master;
|
||
|
||
#we expect STOP SLAVE to produce a warning as the slave is stopped
|
||
#(the server was started with skip-slave-start)
|
||
|
||
--disable_warnings
|
||
stop slave;
|
||
--enable_warnings
|
||
--require r/slave-stopped.result
|
||
show status like 'Slave_running';
|
||
connection master;
|
||
reset master;
|
||
connection slave;
|
||
reset slave;
|
||
start slave;
|
||
--require r/slave-running.result
|
||
show status like 'Slave_running';
|
||
connection master;
|
||
|
||
# We should be clean at this point, now we will run in the file from above.
|
||
|
||
--exec $MYSQL -e "source $MYSQLTEST_VARDIR/tmp/remote.sql"
|
||
|
||
# Lets Check the tables on the Master
|
||
|
||
SELECT COUNT(*) from t1;
|
||
SELECT COUNT(*) from t2;
|
||
SELECT COUNT(*) from t3;
|
||
SELECT * FROM t1 ORDER BY word LIMIT 5;
|
||
SELECT * FROM t2 ORDER BY id LIMIT 5;
|
||
SELECT c1, c3, c4, c5 FROM t3 ORDER BY c1 LIMIT 5;
|
||
|
||
# Should have the same on the slave;
|
||
|
||
sync_slave_with_master;
|
||
SELECT COUNT(*) from t1;
|
||
SELECT COUNT(*) from t2;
|
||
SELECT COUNT(*) from t3;
|
||
SELECT * FROM t1 ORDER BY word LIMIT 5;
|
||
SELECT * FROM t2 ORDER BY id LIMIT 5;
|
||
SELECT c1, c3, c4, c5 FROM t3 ORDER BY c1 LIMIT 5;
|
||
connection master;
|
||
|
||
# We should be gold by the time, so I will get rid of our file.
|
||
|
||
--exec rm $MYSQLTEST_VARDIR/tmp/remote.sql
|
||
################### End Bug 17654 ######################
|
||
|
||
# LOAD DATA
|
||
--disable_query_log
|
||
select "--- Test 5 LOAD DATA --" as "";
|
||
--enable_query_log
|
||
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||
--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002
|
||
|
||
# Bug#7853 (mysqlbinlog does not accept input from stdin)
|
||
|
||
--disable_query_log
|
||
select "--- Test 6 reading stdin --" as "";
|
||
--enable_query_log
|
||
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
|
||
--exec $MYSQL_BINLOG --short-form - < $MYSQLTEST_VARDIR/log/master-bin.000001
|
||
|
||
--disable_query_log
|
||
select "--- Test 7 reading stdin w/position --" as "";
|
||
--enable_query_log
|
||
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
|
||
--exec $MYSQL_BINLOG --short-form --position=416 - < $MYSQLTEST_VARDIR/log/master-bin.000001
|
||
|
||
# Bug#16217 (mysql client did not know how not switch its internal charset)
|
||
--disable_query_log
|
||
select "--- Test 8 switch internal charset --" as "";
|
||
--enable_query_log
|
||
sync_slave_with_master;
|
||
|
||
#we expect STOP SLAVE to produce a warning as the slave is stopped
|
||
#(the server was started with skip-slave-start)
|
||
|
||
--disable_warnings
|
||
stop slave;
|
||
--enable_warnings
|
||
--require r/slave-stopped.result
|
||
show status like 'Slave_running';
|
||
connection master;
|
||
reset master;
|
||
connection slave;
|
||
reset slave;
|
||
start slave;
|
||
--require r/slave-running.result
|
||
show status like 'Slave_running';
|
||
connection master;
|
||
|
||
create table t4 (f text character set utf8);
|
||
create table t5 (f text character set cp932);
|
||
--exec $MYSQL --default-character-set=utf8 test -e "insert into t4 values(_utf8'ソ')"
|
||
--exec $MYSQL --default-character-set=cp932 test -e "insert into t5 values(_cp932'<27>\');"
|
||
flush logs;
|
||
rename table t4 to t04, t5 to t05;
|
||
--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 | $MYSQL --default-character-set=utf8
|
||
# original and recovered data must be equal
|
||
select HEX(f) from t04;
|
||
select HEX(f) from t4;
|
||
select HEX(f) from t05;
|
||
select HEX(f) from t5;
|
||
|
||
# slave should have same
|
||
sync_slave_with_master;
|
||
select HEX(f) from t04;
|
||
select HEX(f) from t4;
|
||
select HEX(f) from t05;
|
||
select HEX(f) from t5;
|
||
|
||
--disable_query_log
|
||
select "--- Test cleanup --" as "";
|
||
--enable_query_log
|
||
# clean up
|
||
connection master;
|
||
sync_slave_with_master;
|
||
|
||
connection master;
|
||
|
||
# BUG#17654 also test mysqlbinlog to ensure it can read the binlog from a remote server
|
||
# and ensure that the results are the same as if read from a file (the same file).
|
||
|
||
--disable_warnings
|
||
DROP TABLE IF EXISTS t1;
|
||
--enable_warnings
|
||
|
||
CREATE TABLE t1 (a INT NOT NULL KEY, b INT);
|
||
|
||
INSERT INTO t1 VALUES(1,1);
|
||
|
||
SELECT * FROM t1;
|
||
|
||
FLUSH LOGS;
|
||
|
||
--exec $MYSQL_BINLOG --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 > $MYSQLTEST_VARDIR/tmp/remote.sql
|
||
--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/local.sql
|
||
|
||
--diff_files $MYSQLTEST_VARDIR/tmp/local.sql $MYSQLTEST_VARDIR/tmp/remote.sql
|
||
|
||
--exec rm $MYSQLTEST_VARDIR/tmp/remote.sql
|
||
|
||
--exec rm $MYSQLTEST_VARDIR/tmp/local.sql
|
||
|
||
DROP TABLE IF EXISTS t1, t2, t3, t04, t05, t4, t5;
|
||
sync_slave_with_master;
|
||
|
||
# End of 4.1 tests
|