fixed up mysql-test - will not push this yet, as more clean up/testing is to follow

BitKeeper/deleted/.del-README~b8e00a1b57b91f69:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-README~2bddc2706d0834d0:
  ***MISSING WEAVE***
mysql-test/r/alt000001.result:
  mvdir
mysql-test/r/ins000001.result:
  mvdir
mysql-test/r/rpl000001.a.result:
  mvdir
mysql-test/r/rpl000001.b.result:
  mvdir
mysql-test/r/rpl000002.result:
  mvdir
mysql-test/r/rpl000003.result:
  mvdir
mysql-test/r/rpl000004.a.result:
  mvdir
mysql-test/r/rpl000004.b.result:
  mvdir
mysql-test/r/rpl000005.result:
  mvdir
mysql-test/r/rpl000006.result:
  mvdir
mysql-test/r/rpl000007.result:
  mvdir
mysql-test/r/rpl000008.result:
  mvdir
mysql-test/r/rpl000009.result:
  mvdir
mysql-test/r/rpl000010.result:
  mvdir
mysql-test/r/rpl000011.result:
  mvdir
mysql-test/r/rpl000012.result:
  mvdir
mysql-test/r/rpl000012.status.result:
  mvdir
mysql-test/r/rpl000013.result:
  mvdir
mysql-test/r/rpl000013.status.result:
  mvdir
mysql-test/r/sel000001.result:
  mvdir
mysql-test/r/sel000002.result:
  mvdir
mysql-test/r/sel000003.result:
  mvdir
mysql-test/r/sel000004.result:
  mvdir
mysql-test/r/sel000005.result:
  mvdir
mysql-test/r/sel000006.result:
  mvdir
mysql-test/r/sel000007.result:
  mvdir
mysql-test/r/sel000008.result:
  mvdir
mysql-test/r/sel000009.result:
  mvdir
mysql-test/r/sel000010.result:
  mvdir
mysql-test/r/sel000011.result:
  mvdir
mysql-test/r/sel000012.result:
  mvdir
mysql-test/r/sel000013.result:
  mvdir
mysql-test/r/sel000014.result:
  mvdir
mysql-test/r/sel000015.result:
  mvdir
mysql-test/r/sel000016.result:
  mvdir
mysql-test/r/sel000017.result:
  mvdir
mysql-test/r/sel000018.result:
  mvdir
mysql-test/r/sel000019.result:
  mvdir
mysql-test/r/sel000020.result:
  mvdir
mysql-test/r/sel000021.result:
  mvdir
mysql-test/r/sel000022.result:
  mvdir
mysql-test/r/sel000023.result:
  mvdir
mysql-test/r/sel000024.result:
  mvdir
mysql-test/r/sel000025.result:
  mvdir
mysql-test/r/sel000026.result:
  mvdir
mysql-test/r/sel000027.result:
  mvdir
mysql-test/r/sel000028.result:
  mvdir
mysql-test/r/sel000029.result:
  mvdir
mysql-test/r/sel000030.result:
  mvdir
mysql-test/r/sel000100.result:
  mvdir
mysql-test/r/shw000001.result:
  mvdir
mysql-test/t/README:
  mvdir
mysql-test/t/err000001.test:
  mvdir
mysql-test/t/rpl000007-slave.opt:
  mvdir
mysql-test/t/rpl000008-slave.opt:
  mvdir
mysql-test/t/rpl000009-slave.opt:
  mvdir
mysql-test/t/rpl000010-slave.opt:
  mvdir
mysql-test/t/rpl000013-slave.opt:
  mvdir
BitKeeper/deleted/.del-start-mysqld~9c8f21a7ab97793a:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-stop-mysqld~89a1194045f05d1c:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-translate-tests~3869c1fdf0a5ea1a:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-README~108667adaeabe3f5:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-README~c5aaceda4c2b1a8:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-key.master~e6b83af25df0ce5:
  ***MISSING WEAVE***
mysql-test/std_data/words.dat:
  Rename: mysql-test/std_data/words -> mysql-test/std_data/words.dat
BitKeeper/deleted/.del-simple-select.master~6f3eb98812926caf:
  ***MISSING WEAVE***
Makefile.am:
  add mysql-test to distribution
configure.in:
  added mysql-test
libmysql/Makefile.am:
  include hash.h
libmysql/Makefile.shared:
  add hash to libmysqlclient
mysql-test/Makefile.am:
  mysql-test is now in source dist also
mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***
mysql-test/install_test_db:
  renamed file, moved to different directory, and fixed up to work on binary dist
mysql-test/mysql-test-run:
  clean-up of test suite, make it work on binary dist
mysql-test/t/alt000001.test:
  moved directory
mysql-test/t/ins000001.test:
  moved directory
mysql-test/t/rpl000001.test:
  moved dir
mysql-test/t/rpl000002.test:
  moved dir
mysql-test/t/rpl000003.test:
  moved dir
mysql-test/t/rpl000004.test:
  moved dir
mysql-test/t/rpl000005.test:
  moved dir
mysql-test/t/rpl000006.test:
  moved dir
mysql-test/t/rpl000007.test:
  moved dir
mysql-test/t/rpl000008.test:
  moved dir
mysql-test/t/rpl000009.test:
  moved dir
mysql-test/t/rpl000010.test:
  moved dir
mysql-test/t/rpl000011.test:
  moved dir
mysql-test/t/rpl000012.test:
  moved dir
mysql-test/t/rpl000013.test:
  moved dir
mysql-test/t/sel000001.test:
  moved dir
mysql-test/t/sel000002.test:
  moved dir
BitKeeper/etc/ignore:
  Added libmysql_r/hash.c scripts/mysql-3.23.29-gamma-pc-linux-gnu-i686.tar.gz to the ignore list
mysql-test/t/sel000003.test:
  moved dir
mysql-test/t/sel000004.test:
  moved dir
mysql-test/t/sel000005.test:
  moved dir
mysql-test/t/sel000100.test:
  moved dir
mysql-test/t/shw000001.test:
  moved dir
scripts/make_binary_distribution.sh:
  fixes to include mysql-test
  added -debug option to exit after building temp dir before tar.gz 
  removed a bunch of SCCS files

29 files changed, 44 insertions, 44 deletions

diff --git a/mysql-test/t/3.23/README b/mysql-test/t/README
index e69de29bb2d..e69de29bb2d 100644
--- a/mysql-test/t/3.23/README
+++ b/mysql-test/t/README
diff --git a/mysql-test/t/3.23/alt000001.test b/mysql-test/t/alt000001.test
index c6c767b8d5d..88defc5b035 100644
--- a/mysql-test/t/3.23/alt000001.test
+++ b/mysql-test/t/alt000001.test
@@ -3,4 +3,4 @@ drop table if exists x;
 create table x (n int);
 insert into x values(9),(3),(12),(10);
 alter table x order by n;
-@r/3.23/alt000001.result select * from x;
+@r/alt000001.result select * from x;
diff --git a/mysql-test/t/3.23/err000001.test b/mysql-test/t/err000001.test
index f264c0bb172..f264c0bb172 100644
--- a/mysql-test/t/3.23/err000001.test
+++ b/mysql-test/t/err000001.test
diff --git a/mysql-test/t/3.23/ins000001.test b/mysql-test/t/ins000001.test
index 7fafd7d48f1..1c40d1ffa8d 100644
--- a/mysql-test/t/3.23/ins000001.test
+++ b/mysql-test/t/ins000001.test
@@ -8,4 +8,4 @@ insert into emails values ('sasha@mysql.com'),('monty@mysql.com'),
 create table domain(id int not null auto_increment primary key,
  domain varchar(50), unique(domain));
 insert into domain (domain) select distinct substring(email, locate('@', email)+1) from emails;
-@r/3.23/ins000001.result select * from domain;
+@r/ins000001.result select * from domain;
diff --git a/mysql-test/t/3.23/rpl000001.test b/mysql-test/t/rpl000001.test
index bd094cd6391..5bf0e0dbab5 100644
--- a/mysql-test/t/3.23/rpl000001.test
+++ b/mysql-test/t/rpl000001.test
@@ -1,15 +1,15 @@
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection master;
 use test;
 drop table if exists words;
 create table words (word char(20) not null);
-load data infile '../../std_data/words' into table words;
+load data infile '../../std_data/words.dat' into table words;
 drop table if exists foo;
 create table foo(n int);
 insert into foo values(1),(2);
 connection slave;
 sleep 2;
 use test;
-@r/3.23/rpl000001.a.result select * from foo;
-@r/3.23/rpl000001.b.result select sum(length(word)) from words;
+@r/rpl000001.a.result select * from foo;
+@r/rpl000001.b.result select sum(length(word)) from words;
 
diff --git a/mysql-test/t/3.23/rpl000002.test b/mysql-test/t/rpl000002.test
index b411a0f42ce..29741b5b6cb 100644
--- a/mysql-test/t/3.23/rpl000002.test
+++ b/mysql-test/t/rpl000002.test
@@ -1,4 +1,4 @@
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection master;
 use test;
 drop table if exists x;
@@ -8,4 +8,4 @@ insert into x values (NULL),(NULL),(NULL);
 connection slave;
 use test;
 sleep 0.5;
-@r/3.23/rpl000002.result select * from x;
+@r/rpl000002.result select * from x;
diff --git a/mysql-test/t/3.23/rpl000003.test b/mysql-test/t/rpl000003.test
index 8aa6eb09c4d..d7e21a3590a 100644
--- a/mysql-test/t/3.23/rpl000003.test
+++ b/mysql-test/t/rpl000003.test
@@ -1,4 +1,4 @@
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection master;
 drop table if exists x;
 create table x(n int primary key);
@@ -6,4 +6,4 @@ create table x(n int primary key);
 insert into x values (3);
 connection slave;
 sleep 0.5;
-@r/3.23/rpl000003.result select * from x;                                     
+@r/rpl000003.result select * from x;                                     
diff --git a/mysql-test/t/3.23/rpl000004.test b/mysql-test/t/rpl000004.test
index 795bb0e32a2..b7ab81a0553 100644
--- a/mysql-test/t/3.23/rpl000004.test
+++ b/mysql-test/t/rpl000004.test
@@ -1,18 +1,18 @@
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection master;
 use test;
 set SQL_LOG_BIN=0;
 drop table if exists words;
 create table words (word char(20) not null, index(word));
-load data infile '../../std_data/words' into table words;
+load data infile '../../std_data/words.dat' into table words;
 drop table if exists words1;
 create table words1 (word char(20) not null);
-load data infile '../../std_data/words' into table words1;
+load data infile '../../std_data/words.dat' into table words1;
 connection slave;
 use test;
 drop table if exists words;
 load table words from master;
 drop table if exists words1;
 load table words1 from master;
-@r/3.23/rpl000004.a.result check table words;
-@r/3.23/rpl000004.b.result select count(*) from words1;
+@r/rpl000004.a.result check table words;
+@r/rpl000004.b.result select count(*) from words1;
diff --git a/mysql-test/t/3.23/rpl000005.test b/mysql-test/t/rpl000005.test
index dac48849e25..944f701d765 100644
--- a/mysql-test/t/3.23/rpl000005.test
+++ b/mysql-test/t/rpl000005.test
@@ -1,4 +1,4 @@
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection master;
 drop table if exists test;
 CREATE TABLE test (name varchar(64), age smallint(3));
@@ -6,7 +6,7 @@ INSERT INTO  test SET name='Andy', age=31;
 INSERT test SET name='Jacob', age=2;
 INSERT into test SET name='Caleb', age=1;
 ALTER TABLE test ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY;
-@r/3.23/rpl000005.result select * from test;
+@r/rpl000005.result select * from test;
 connection slave;
 sleep 0.5;
-@r/3.23/rpl000005.result select * from test;
+@r/rpl000005.result select * from test;
diff --git a/mysql-test/t/3.23/rpl000006.test b/mysql-test/t/rpl000006.test
index 8f85b3a7952..56971cd049c 100644
--- a/mysql-test/t/3.23/rpl000006.test
+++ b/mysql-test/t/rpl000006.test
@@ -1,12 +1,12 @@
-source t/include/master-slave.inc;
+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');
-@r/3.23/rpl000006.result select unix_timestamp(t) from foo;
+@r/rpl000006.result select unix_timestamp(t) from foo;
 connection slave;
 drop table if exists foo;
 load table foo from master;
-@r/3.23/rpl000006.result select unix_timestamp(t) from foo;
+@r/rpl000006.result select unix_timestamp(t) from foo;
diff --git a/mysql-test/t/3.23/rpl000007-slave.opt b/mysql-test/t/rpl000007-slave.opt
index 9ff99337d1f..9ff99337d1f 100644
--- a/mysql-test/t/3.23/rpl000007-slave.opt
+++ b/mysql-test/t/rpl000007-slave.opt
diff --git a/mysql-test/t/3.23/rpl000007.test b/mysql-test/t/rpl000007.test
index 5b9ef12bddd..2a3748868d3 100644
--- a/mysql-test/t/3.23/rpl000007.test
+++ b/mysql-test/t/rpl000007.test
@@ -1,6 +1,6 @@
 #this one assumes we are ignoring updates on table foo, but doing
 #the ones on bar
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection slave;
 use test;
 drop table if exists foo;
@@ -16,4 +16,4 @@ create table bar (m int);
 insert into bar values(15);
 connection slave;
 sleep 1;
-@r/3.23/rpl000007.result select foo.n,bar.m from foo,bar;
+@r/rpl000007.result select foo.n,bar.m from foo,bar;
diff --git a/mysql-test/t/3.23/rpl000008-slave.opt b/mysql-test/t/rpl000008-slave.opt
index 79b3bf6174b..79b3bf6174b 100644
--- a/mysql-test/t/3.23/rpl000008-slave.opt
+++ b/mysql-test/t/rpl000008-slave.opt
diff --git a/mysql-test/t/3.23/rpl000008.test b/mysql-test/t/rpl000008.test
index 58819c2835f..a50016ed9c0 100644
--- a/mysql-test/t/3.23/rpl000008.test
+++ b/mysql-test/t/rpl000008.test
@@ -1,6 +1,6 @@
 #this one assumes we are ignoring updates on table foo, but doing
 #the ones on all other tables
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection slave;
 use test;
 drop table if exists foo;
@@ -19,4 +19,4 @@ create table choo (k int);
 insert into choo values(55);
 connection slave;
 sleep 1;
-@r/3.23/rpl000008.result select foo.n,bar.m,choo.k from foo,bar,choo;
+@r/rpl000008.result select foo.n,bar.m,choo.k from foo,bar,choo;
diff --git a/mysql-test/t/3.23/rpl000009-slave.opt b/mysql-test/t/rpl000009-slave.opt
index 245e310c5d8..245e310c5d8 100644
--- a/mysql-test/t/3.23/rpl000009-slave.opt
+++ b/mysql-test/t/rpl000009-slave.opt
diff --git a/mysql-test/t/3.23/rpl000009.test b/mysql-test/t/rpl000009.test
index ae491e1ab98..0a872bb3663 100644
--- a/mysql-test/t/3.23/rpl000009.test
+++ b/mysql-test/t/rpl000009.test
@@ -1,6 +1,6 @@
 #this one assumes we are ignoring updates on tables in database foo, but doing
 #the ones in database bar
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection master;
 drop database if exists foo;
 create database foo;
@@ -20,4 +20,4 @@ create table bar.bar (m int);
 insert into bar.bar values(15);
 connection slave;
 sleep 1;
-@r/3.23/rpl000009.result select foo.foo.n,bar.bar.m from foo.foo,bar.bar;
+@r/rpl000009.result select foo.foo.n,bar.bar.m from foo.foo,bar.bar;
diff --git a/mysql-test/t/3.23/rpl000010-slave.opt b/mysql-test/t/rpl000010-slave.opt
index 429a7f63f7b..429a7f63f7b 100644
--- a/mysql-test/t/3.23/rpl000010-slave.opt
+++ b/mysql-test/t/rpl000010-slave.opt
diff --git a/mysql-test/t/3.23/rpl000010.test b/mysql-test/t/rpl000010.test
index 3bb55dc854a..6b5ec69fb5f 100644
--- a/mysql-test/t/3.23/rpl000010.test
+++ b/mysql-test/t/rpl000010.test
@@ -1,6 +1,6 @@
 #this tests the offset off by 22 mystery bug
 #must run slave with --disconnect-slave-event-count=1 --master-connect-retry=1
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection slave;
 drop table if exists foo;
 connection master;
@@ -10,4 +10,4 @@ insert into foo values(NULL);
 insert into foo values(2);
 connection slave;
 sleep 5;
-@r/3.23/rpl000010.result select n from foo;
+@r/rpl000010.result select n from foo;
diff --git a/mysql-test/t/3.23/rpl000011.test b/mysql-test/t/rpl000011.test
index a5759f52e09..f0776136541 100644
--- a/mysql-test/t/3.23/rpl000011.test
+++ b/mysql-test/t/rpl000011.test
@@ -1,4 +1,4 @@
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection master;
 use test;
 drop table if exists foo;
@@ -14,5 +14,5 @@ insert into foo values(2);
 connection slave;
 #let slave catch up
 sleep 1;
-@r/3.23/rpl000011.result select * from foo;
+@r/rpl000011.result select * from foo;
 
diff --git a/mysql-test/t/3.23/rpl000012.test b/mysql-test/t/rpl000012.test
index 205c78d604c..55d6bd4d4f2 100644
--- a/mysql-test/t/3.23/rpl000012.test
+++ b/mysql-test/t/rpl000012.test
@@ -1,4 +1,4 @@
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection master;
 drop table if exists x;
 create table x(n int);
@@ -15,5 +15,5 @@ insert into x values(6);
 disconnect master1;
 connection slave;
 sleep 1;
-@r/3.23/rpl000012.result select * from x;
-@r/3.23/rpl000012.status.result show status like 'Slave_open_temp_tables';
+@r/rpl000012.result select * from x;
+@r/rpl000012.status.result show status like 'Slave_open_temp_tables';
diff --git a/mysql-test/t/3.23/rpl000013-slave.opt b/mysql-test/t/rpl000013-slave.opt
index 2662c695b41..2662c695b41 100644
--- a/mysql-test/t/3.23/rpl000013-slave.opt
+++ b/mysql-test/t/rpl000013-slave.opt
diff --git a/mysql-test/t/3.23/rpl000013.test b/mysql-test/t/rpl000013.test
index f54482f41e9..ec015bbe357 100644
--- a/mysql-test/t/3.23/rpl000013.test
+++ b/mysql-test/t/rpl000013.test
@@ -1,4 +1,4 @@
-source t/include/master-slave.inc;
+source include/master-slave.inc;
 connection master;
 drop table if exists x;
 create table x(n int);
@@ -21,5 +21,5 @@ while ($1)
  sleep 0.2;
  dec $1;
 }
-@r/3.23/rpl000013.result select * from x;
-@r/3.23/rpl000013.status.result show status like 'Slave_open_temp_tables';
+@r/rpl000013.result select * from x;
+@r/rpl000013.status.result show status like 'Slave_open_temp_tables';
diff --git a/mysql-test/t/3.23/sel000001.test b/mysql-test/t/sel000001.test
index 233e986ad3c..7f5fb303984 100644
--- a/mysql-test/t/3.23/sel000001.test
+++ b/mysql-test/t/sel000001.test
@@ -14,4 +14,4 @@
 DROP TABLE IF EXISTS t;
 CREATE TABLE t (s CHAR(20) PRIMARY KEY, id INT);
 INSERT INTO t VALUES ('cat', 1), ('mouse', 3), ('dog', 2), ('snake', 77);
-@r/3.23/sel000001.result SELECT s, id FROM t WHERE s = 'mouse';
+@r/sel000001.result SELECT s, id FROM t WHERE s = 'mouse';
diff --git a/mysql-test/t/3.23/sel000002.test b/mysql-test/t/sel000002.test
index 3a0178a05d4..27c88b503dc 100644
--- a/mysql-test/t/3.23/sel000002.test
+++ b/mysql-test/t/sel000002.test
@@ -13,4 +13,4 @@
 DROP TABLE IF EXISTS t;
 CREATE TABLE t (n INT);
 INSERT INTO t VALUES (1), (2), (3);
-@r/3.23/sel000002.result SELECT * FROM t;
+@r/sel000002.result SELECT * FROM t;
diff --git a/mysql-test/t/3.23/sel000003.test b/mysql-test/t/sel000003.test
index 883be4fb079..cef82ab2596 100644
--- a/mysql-test/t/3.23/sel000003.test
+++ b/mysql-test/t/sel000003.test
@@ -14,4 +14,4 @@
 DROP TABLE IF EXISTS t;
 CREATE TABLE t (name CHAR(20) NOT NULL PRIMARY KEY, score SMALLINT NOT NULL, KEY(score));
 INSERT INTO t VALUES ('Sasha', 20), ('Matt', 20), ('Monty', 10), ('David', 10), ('Tim', 10), ('Jeremy', 10);
-@r/3.23/sel000003.result SELECT COUNT(*) as n, score FROM t GROUP BY score;
+@r/sel000003.result SELECT COUNT(*) as n, score FROM t GROUP BY score;
diff --git a/mysql-test/t/3.23/sel000004.test b/mysql-test/t/sel000004.test
index 6146ff641e0..d7b59a9f99e 100644
--- a/mysql-test/t/3.23/sel000004.test
+++ b/mysql-test/t/sel000004.test
@@ -16,6 +16,6 @@ val int(10) not null);
 insert into elt_ck1 values (1),(2),(4);
 insert into elt_ck2 values (1,1),(2,1),(3,1),(4,2);
 
-@r/3.23/sel000004.result select one.id, elt(two.val,'one','two') from elt_ck1 one, elt_ck2 two 
+@r/sel000004.result select one.id, elt(two.val,'one','two') from elt_ck1 one, elt_ck2 two 
 where two.id=one.id order by one.id;
 
diff --git a/mysql-test/t/3.23/sel000005.test b/mysql-test/t/sel000005.test
index 18541d5d69e..d6dbb381654 100644
--- a/mysql-test/t/3.23/sel000005.test
+++ b/mysql-test/t/sel000005.test
@@ -16,6 +16,6 @@ val int(10) not null);
 insert into elt_ck1 values (1),(2),(4);
 insert into elt_ck2 values (1,1),(2,1),(3,1),(4,2);
 
-@r/3.23/sel000005.result select one.id, elt(two.val,'one','two') from elt_ck1 one, elt_ck2 two 
+@r/sel000005.result select one.id, elt(two.val,'one','two') from elt_ck1 one, elt_ck2 two 
 where two.id=one.id ;
 
diff --git a/mysql-test/t/3.23/sel000100.test b/mysql-test/t/sel000100.test
index cd3f7005445..718e67de9ea 100644
--- a/mysql-test/t/3.23/sel000100.test
+++ b/mysql-test/t/sel000100.test
@@ -21,7 +21,7 @@ CREATE TABLE test2 (
   KEY NAME (NAME)
 );
 
-@r/3.23/sel000100.result SELECT DISTINCT
+@r/sel000100.result SELECT DISTINCT
     test2.id AS key_link_id,
     test2.name AS link
 FROM test1
diff --git a/mysql-test/t/3.23/shw000001.test b/mysql-test/t/shw000001.test
index 0abb940d207..c92d710a49c 100644
--- a/mysql-test/t/3.23/shw000001.test
+++ b/mysql-test/t/shw000001.test
@@ -4,4 +4,4 @@ create table test (
   test_set set( 'val1', 'val2', 'val3' ) not null default '',
   name char(20) default 'O''Brien'
   ) comment = 'it\'s a table' ;
-@r/3.23/shw000001.result show create table test ;
+@r/shw000001.result show create table test ;