summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <nick@nick.leippe.com>2002-05-31 16:56:48 -0700
committerunknown <nick@nick.leippe.com>2002-05-31 16:56:48 -0700
commit32113efe2a7d32bfa5820cda37164436a53719cc (patch)
tree2ff9a5f2385ea9e0e3b46f2f4b4cd6cfd1e78946 /mysql-test
parent0ceaf6d2c28f4f639a0ba5c329964e4dbe71cb7f (diff)
parent169a4d9282b6186dd41419ba396b2aaaf4d04a2b (diff)
downloadmariadb-git-32113efe2a7d32bfa5820cda37164436a53719cc.tar.gz
Merge nleippe@work.mysql.com:/home/bk/mysql
into nick.leippe.com:/home/nick/mysql/mysql
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/rpl_empty_master_crash.result2
-rw-r--r--mysql-test/t/rpl_empty_master_crash.test8
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/rpl_empty_master_crash.result b/mysql-test/r/rpl_empty_master_crash.result
new file mode 100644
index 00000000000..e9111fdb401
--- /dev/null
+++ b/mysql-test/r/rpl_empty_master_crash.result
@@ -0,0 +1,2 @@
+Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter
+ 0 0 0 No 0 0
diff --git a/mysql-test/t/rpl_empty_master_crash.test b/mysql-test/t/rpl_empty_master_crash.test
new file mode 100644
index 00000000000..7c4437a3657
--- /dev/null
+++ b/mysql-test/t/rpl_empty_master_crash.test
@@ -0,0 +1,8 @@
+source include/master-slave.inc;
+connection master;
+use test;
+drop table if exists t1;
+show slave status;
+#--error 1218 # for mysql-4.0
+--error 1042
+load table t1 from master;