sql/slave.cc

    fixed typo in the error message
sql/sql_base.cc
    fixed bugs in reopen_name_locked_table() after talking to Monty

added a test case for restore + select

1 files changed, 63 insertions, 0 deletions

diff --git a/tests/restore-lock.smack b/tests/restore-lock.smack
new file mode 100755
index 00000000000..a591ab2d383
--- /dev/null
+++ b/tests/restore-lock.smack
@@ -0,0 +1,63 @@
+#! /usr/local/bin/mysql-super-smack
+
+query "select"
+ {
+   type "select";
+   query "select count(*) from w";
+   has_result_set "y";
+   parsed "n";
+ }
+
+query "restore"
+ {
+   type "restore";
+   query "restore table w from '/tmp'";
+   has_result_set "y";
+   parsed "n";
+ }
+
+query "drop"
+ {
+   type "drop";
+   query "drop table if exists w";
+   has_result_set "n";
+   parsed "n";
+ }
+
+
+
+client "restorer"
+ {
+  user "root";
+  pass "";
+  host "localhost";
+  db "test";
+  query_barrel "1 drop 1 restore";
+ }
+
+client "selector"
+ {
+  user "root";
+  pass "";
+  host "localhost";
+  db "test";
+  query_barrel "-3 1 select";
+ }
+
+main
+ {
+   selector.init();
+   restorer.init();
+   selector.create_threads(1);
+   restorer.create_threads(1);
+   selector.set_num_rounds(1);
+   restorer.set_num_rounds(1);
+   selector.connect();
+   restorer.connect();
+   restorer.unload_query_barrel();
+   selector.unload_query_barrel();
+   restorer.collect_threads();
+   selector.collect_threads();
+   selector.disconnect();
+   restorer.disconnect();
+ }
\ No newline at end of file