Fix for LOAD DATA FROM MASTER when using tables with checksum

Fixed some wrong test cases


Docs/manual.texi:
  Changelog
extra/perror.c:
  Added BDB table errors
include/myisam.h:
  Fix for LOAD DATA FROM MASTER when using tables with checksum
myisam/mi_check.c:
  Fix for LOAD DATA FROM MASTER when using tables with checksum
mysql-test/mysql-test-run.sh:
  Better logging
mysql-test/r/join.result:
  Fixed missing results
mysql-test/r/rpl000006.result:
  Updated result
mysql-test/t/join.test:
  Fixed wrong test
mysql-test/t/rpl000001.test:
  Fixed wrong test
mysql-test/t/rpl000006.test:
  Cleanup
mysql-test/t/rpl000017-slave.sh:
  Fixed too long password
mysql-test/t/rpl000017.test:
  Fixed too long password
sql/ha_myisam.cc:
  Fix for LOAD DATA FROM MASTER when using tables with checksum
sql/handler.cc:
  Unique error for DEADLOCK
sql/slave.cc:
  Fix for LOAD DATA FROM MASTER when using tables with checksum

1 files changed, 26 insertions, 13 deletions

diff --git a/mysql-test/t/rpl000006.test b/mysql-test/t/rpl000006.test
index b8ee690837e..495f34bd5e7 100644
--- a/mysql-test/t/rpl000006.test
+++ b/mysql-test/t/rpl000006.test
@@ -1,33 +1,46 @@
+#
+# Test forced timestamp
+#
 source include/master-slave.inc;
 connection master;
-set SQL_LOG_BIN=0;
-set timestamp=200006;
-drop table if exists foo;
-create table foo(t timestamp not null,a char(1));
-insert into foo ( a) values ('F');
-select unix_timestamp(t) from foo;
+
+# Don't log table creating to the slave as we want to test LOAD TABLE
+set SQL_LOG_BIN=0,timestamp=200006;
+drop table if exists t1;
+create table t1(t timestamp not null,a char(1));
+insert into t1 ( a) values ('F');
+select unix_timestamp(t) from t1;
 connection slave;
-drop table if exists foo;
-load table foo from master;
-select unix_timestamp(t) from foo;
+drop table if exists t1;
+load table t1 from master;
+select unix_timestamp(t) from t1;
+
+# Delete the created table on master and slave
 connection master;
-drop table foo;
+set SQL_LOG_BIN=1,timestamp=default;
+drop table t1;
 save_master_pos;
 connection slave;
 sync_with_master;
 connection master;
-set SQL_LOG_BIN=1;
+
+#
+# Test copying table with checksum
+#
+
+# Don't log table creating to the slave as we want to test LOAD TABLE
+set SQL_LOG_BIN=0;
+
 CREATE TABLE t1 (
  a int not null
 ) TYPE=MyISAM MAX_ROWS=4000 CHECKSUM=1;
-
 INSERT INTO t1 VALUES (1);
 save_master_pos;
 connection slave;
 sync_with_master;
-drop table t1;
 load table t1 from master;
 check table t1;
+drop table t1;
 connection master;
 drop table t1;
 save_master_pos;