From 1a6031856007ea2fa4c87331b4abee46edb2bf66 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 7 Dec 2000 07:54:59 -0700 Subject: 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 --- mysql-test/t/3.23/README | 0 mysql-test/t/3.23/alt000001.test | 6 ------ mysql-test/t/3.23/err000001.test | 3 --- mysql-test/t/3.23/ins000001.test | 11 ----------- mysql-test/t/3.23/rpl000001.test | 15 --------------- mysql-test/t/3.23/rpl000002.test | 11 ----------- mysql-test/t/3.23/rpl000003.test | 9 --------- mysql-test/t/3.23/rpl000004.test | 18 ------------------ mysql-test/t/3.23/rpl000005.test | 12 ------------ mysql-test/t/3.23/rpl000006.test | 12 ------------ mysql-test/t/3.23/rpl000007-slave.opt | 1 - mysql-test/t/3.23/rpl000007.test | 19 ------------------- mysql-test/t/3.23/rpl000008-slave.opt | 1 - mysql-test/t/3.23/rpl000008.test | 22 ---------------------- mysql-test/t/3.23/rpl000009-slave.opt | 1 - mysql-test/t/3.23/rpl000009.test | 23 ----------------------- mysql-test/t/3.23/rpl000010-slave.opt | 1 - mysql-test/t/3.23/rpl000010.test | 13 ------------- mysql-test/t/3.23/rpl000011.test | 18 ------------------ mysql-test/t/3.23/rpl000012.test | 19 ------------------- mysql-test/t/3.23/rpl000013-slave.opt | 1 - mysql-test/t/3.23/rpl000013.test | 25 ------------------------- mysql-test/t/3.23/sel000001.test | 17 ----------------- mysql-test/t/3.23/sel000002.test | 16 ---------------- mysql-test/t/3.23/sel000003.test | 17 ----------------- mysql-test/t/3.23/sel000004.test | 21 --------------------- mysql-test/t/3.23/sel000005.test | 21 --------------------- mysql-test/t/3.23/sel000100.test | 30 ------------------------------ mysql-test/t/3.23/shw000001.test | 7 ------- mysql-test/t/README | 0 mysql-test/t/alt000001.test | 6 ++++++ mysql-test/t/err000001.test | 3 +++ mysql-test/t/ins000001.test | 11 +++++++++++ mysql-test/t/rpl000001.test | 15 +++++++++++++++ mysql-test/t/rpl000002.test | 11 +++++++++++ mysql-test/t/rpl000003.test | 9 +++++++++ mysql-test/t/rpl000004.test | 18 ++++++++++++++++++ mysql-test/t/rpl000005.test | 12 ++++++++++++ mysql-test/t/rpl000006.test | 12 ++++++++++++ mysql-test/t/rpl000007-slave.opt | 1 + mysql-test/t/rpl000007.test | 19 +++++++++++++++++++ mysql-test/t/rpl000008-slave.opt | 1 + mysql-test/t/rpl000008.test | 22 ++++++++++++++++++++++ mysql-test/t/rpl000009-slave.opt | 1 + mysql-test/t/rpl000009.test | 23 +++++++++++++++++++++++ mysql-test/t/rpl000010-slave.opt | 1 + mysql-test/t/rpl000010.test | 13 +++++++++++++ mysql-test/t/rpl000011.test | 18 ++++++++++++++++++ mysql-test/t/rpl000012.test | 19 +++++++++++++++++++ mysql-test/t/rpl000013-slave.opt | 1 + mysql-test/t/rpl000013.test | 25 +++++++++++++++++++++++++ mysql-test/t/sel000001.test | 17 +++++++++++++++++ mysql-test/t/sel000002.test | 16 ++++++++++++++++ mysql-test/t/sel000003.test | 17 +++++++++++++++++ mysql-test/t/sel000004.test | 21 +++++++++++++++++++++ mysql-test/t/sel000005.test | 21 +++++++++++++++++++++ mysql-test/t/sel000100.test | 30 ++++++++++++++++++++++++++++++ mysql-test/t/shw000001.test | 7 +++++++ 58 files changed, 370 insertions(+), 370 deletions(-) delete mode 100644 mysql-test/t/3.23/README delete mode 100644 mysql-test/t/3.23/alt000001.test delete mode 100644 mysql-test/t/3.23/err000001.test delete mode 100644 mysql-test/t/3.23/ins000001.test delete mode 100644 mysql-test/t/3.23/rpl000001.test delete mode 100644 mysql-test/t/3.23/rpl000002.test delete mode 100644 mysql-test/t/3.23/rpl000003.test delete mode 100644 mysql-test/t/3.23/rpl000004.test delete mode 100644 mysql-test/t/3.23/rpl000005.test delete mode 100644 mysql-test/t/3.23/rpl000006.test delete mode 100644 mysql-test/t/3.23/rpl000007-slave.opt delete mode 100644 mysql-test/t/3.23/rpl000007.test delete mode 100644 mysql-test/t/3.23/rpl000008-slave.opt delete mode 100644 mysql-test/t/3.23/rpl000008.test delete mode 100644 mysql-test/t/3.23/rpl000009-slave.opt delete mode 100644 mysql-test/t/3.23/rpl000009.test delete mode 100644 mysql-test/t/3.23/rpl000010-slave.opt delete mode 100644 mysql-test/t/3.23/rpl000010.test delete mode 100644 mysql-test/t/3.23/rpl000011.test delete mode 100644 mysql-test/t/3.23/rpl000012.test delete mode 100644 mysql-test/t/3.23/rpl000013-slave.opt delete mode 100644 mysql-test/t/3.23/rpl000013.test delete mode 100644 mysql-test/t/3.23/sel000001.test delete mode 100644 mysql-test/t/3.23/sel000002.test delete mode 100644 mysql-test/t/3.23/sel000003.test delete mode 100644 mysql-test/t/3.23/sel000004.test delete mode 100644 mysql-test/t/3.23/sel000005.test delete mode 100644 mysql-test/t/3.23/sel000100.test delete mode 100644 mysql-test/t/3.23/shw000001.test create mode 100644 mysql-test/t/README create mode 100644 mysql-test/t/alt000001.test create mode 100644 mysql-test/t/err000001.test create mode 100644 mysql-test/t/ins000001.test create mode 100644 mysql-test/t/rpl000001.test create mode 100644 mysql-test/t/rpl000002.test create mode 100644 mysql-test/t/rpl000003.test create mode 100644 mysql-test/t/rpl000004.test create mode 100644 mysql-test/t/rpl000005.test create mode 100644 mysql-test/t/rpl000006.test create mode 100644 mysql-test/t/rpl000007-slave.opt create mode 100644 mysql-test/t/rpl000007.test create mode 100644 mysql-test/t/rpl000008-slave.opt create mode 100644 mysql-test/t/rpl000008.test create mode 100644 mysql-test/t/rpl000009-slave.opt create mode 100644 mysql-test/t/rpl000009.test create mode 100644 mysql-test/t/rpl000010-slave.opt create mode 100644 mysql-test/t/rpl000010.test create mode 100644 mysql-test/t/rpl000011.test create mode 100644 mysql-test/t/rpl000012.test create mode 100644 mysql-test/t/rpl000013-slave.opt create mode 100644 mysql-test/t/rpl000013.test create mode 100644 mysql-test/t/sel000001.test create mode 100644 mysql-test/t/sel000002.test create mode 100644 mysql-test/t/sel000003.test create mode 100644 mysql-test/t/sel000004.test create mode 100644 mysql-test/t/sel000005.test create mode 100644 mysql-test/t/sel000100.test create mode 100644 mysql-test/t/shw000001.test (limited to 'mysql-test/t') diff --git a/mysql-test/t/3.23/README b/mysql-test/t/3.23/README deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/mysql-test/t/3.23/alt000001.test b/mysql-test/t/3.23/alt000001.test deleted file mode 100644 index c6c767b8d5d..00000000000 --- a/mysql-test/t/3.23/alt000001.test +++ /dev/null @@ -1,6 +0,0 @@ -use test; -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; diff --git a/mysql-test/t/3.23/err000001.test b/mysql-test/t/3.23/err000001.test deleted file mode 100644 index f264c0bb172..00000000000 --- a/mysql-test/t/3.23/err000001.test +++ /dev/null @@ -1,3 +0,0 @@ -use test; -drop table if exists foo; -!$1146 insert into foo values(1); diff --git a/mysql-test/t/3.23/ins000001.test b/mysql-test/t/3.23/ins000001.test deleted file mode 100644 index 7fafd7d48f1..00000000000 --- a/mysql-test/t/3.23/ins000001.test +++ /dev/null @@ -1,11 +0,0 @@ -use test; -drop table if exists emails; -drop table if exists domain; -drop table if exists domain; -create table emails (email varchar(50)); -insert into emails values ('sasha@mysql.com'),('monty@mysql.com'), -('foo@hotmail.com'),('foo@aol.com'),('bar@aol.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; diff --git a/mysql-test/t/3.23/rpl000001.test b/mysql-test/t/3.23/rpl000001.test deleted file mode 100644 index bd094cd6391..00000000000 --- a/mysql-test/t/3.23/rpl000001.test +++ /dev/null @@ -1,15 +0,0 @@ -source t/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; -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; - diff --git a/mysql-test/t/3.23/rpl000002.test b/mysql-test/t/3.23/rpl000002.test deleted file mode 100644 index b411a0f42ce..00000000000 --- a/mysql-test/t/3.23/rpl000002.test +++ /dev/null @@ -1,11 +0,0 @@ -source t/include/master-slave.inc; -connection master; -use test; -drop table if exists x; -create table x(n int auto_increment primary key); -set insert_id = 2000; -insert into x values (NULL),(NULL),(NULL); -connection slave; -use test; -sleep 0.5; -@r/3.23/rpl000002.result select * from x; diff --git a/mysql-test/t/3.23/rpl000003.test b/mysql-test/t/3.23/rpl000003.test deleted file mode 100644 index 8aa6eb09c4d..00000000000 --- a/mysql-test/t/3.23/rpl000003.test +++ /dev/null @@ -1,9 +0,0 @@ -source t/include/master-slave.inc; -connection master; -drop table if exists x; -create table x(n int primary key); -!insert into x values (1),(2),(2); -insert into x values (3); -connection slave; -sleep 0.5; -@r/3.23/rpl000003.result select * from x; diff --git a/mysql-test/t/3.23/rpl000004.test b/mysql-test/t/3.23/rpl000004.test deleted file mode 100644 index 795bb0e32a2..00000000000 --- a/mysql-test/t/3.23/rpl000004.test +++ /dev/null @@ -1,18 +0,0 @@ -source t/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; -drop table if exists words1; -create table words1 (word char(20) not null); -load data infile '../../std_data/words' 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; diff --git a/mysql-test/t/3.23/rpl000005.test b/mysql-test/t/3.23/rpl000005.test deleted file mode 100644 index dac48849e25..00000000000 --- a/mysql-test/t/3.23/rpl000005.test +++ /dev/null @@ -1,12 +0,0 @@ -source t/include/master-slave.inc; -connection master; -drop table if exists test; -CREATE TABLE test (name varchar(64), age smallint(3)); -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; -connection slave; -sleep 0.5; -@r/3.23/rpl000005.result select * from test; diff --git a/mysql-test/t/3.23/rpl000006.test b/mysql-test/t/3.23/rpl000006.test deleted file mode 100644 index 8f85b3a7952..00000000000 --- a/mysql-test/t/3.23/rpl000006.test +++ /dev/null @@ -1,12 +0,0 @@ -source t/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; -connection slave; -drop table if exists foo; -load table foo from master; -@r/3.23/rpl000006.result select unix_timestamp(t) from foo; diff --git a/mysql-test/t/3.23/rpl000007-slave.opt b/mysql-test/t/3.23/rpl000007-slave.opt deleted file mode 100644 index 9ff99337d1f..00000000000 --- a/mysql-test/t/3.23/rpl000007-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---replicate-do-table=test.bar diff --git a/mysql-test/t/3.23/rpl000007.test b/mysql-test/t/3.23/rpl000007.test deleted file mode 100644 index 5b9ef12bddd..00000000000 --- a/mysql-test/t/3.23/rpl000007.test +++ /dev/null @@ -1,19 +0,0 @@ -#this one assumes we are ignoring updates on table foo, but doing -#the ones on bar -source t/include/master-slave.inc; -connection slave; -use test; -drop table if exists foo; -create table foo (n int); -insert into foo values(4); -connection master; -use test; -drop table if exists foo; -create table foo (n int); -insert into foo values(5); -drop table if exists bar; -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; diff --git a/mysql-test/t/3.23/rpl000008-slave.opt b/mysql-test/t/3.23/rpl000008-slave.opt deleted file mode 100644 index 79b3bf6174b..00000000000 --- a/mysql-test/t/3.23/rpl000008-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---replicate-ignore-table=test.foo diff --git a/mysql-test/t/3.23/rpl000008.test b/mysql-test/t/3.23/rpl000008.test deleted file mode 100644 index 58819c2835f..00000000000 --- a/mysql-test/t/3.23/rpl000008.test +++ /dev/null @@ -1,22 +0,0 @@ -#this one assumes we are ignoring updates on table foo, but doing -#the ones on all other tables -source t/include/master-slave.inc; -connection slave; -use test; -drop table if exists foo; -create table foo (n int); -insert into foo values(4); -connection master; -use test; -drop table if exists foo; -create table foo (n int); -insert into foo values(5); -drop table if exists bar; -create table bar (m int); -insert into bar values(15); -drop table if exists choo; -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; diff --git a/mysql-test/t/3.23/rpl000009-slave.opt b/mysql-test/t/3.23/rpl000009-slave.opt deleted file mode 100644 index 245e310c5d8..00000000000 --- a/mysql-test/t/3.23/rpl000009-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---replicate-wild-do-table=bar.% diff --git a/mysql-test/t/3.23/rpl000009.test b/mysql-test/t/3.23/rpl000009.test deleted file mode 100644 index ae491e1ab98..00000000000 --- a/mysql-test/t/3.23/rpl000009.test +++ /dev/null @@ -1,23 +0,0 @@ -#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; -connection master; -drop database if exists foo; -create database foo; -drop database if exists bar; -create database bar; -connection slave; -sleep 1; -drop table if exists foo.foo; -create table foo.foo (n int); -insert into foo.foo values(4); -connection master; -drop table if exists foo.foo; -create table foo.foo (n int); -insert into foo.foo values(5); -drop table if exists bar.bar; -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; diff --git a/mysql-test/t/3.23/rpl000010-slave.opt b/mysql-test/t/3.23/rpl000010-slave.opt deleted file mode 100644 index 429a7f63f7b..00000000000 --- a/mysql-test/t/3.23/rpl000010-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---disconnect-slave-event-count=1 diff --git a/mysql-test/t/3.23/rpl000010.test b/mysql-test/t/3.23/rpl000010.test deleted file mode 100644 index 3bb55dc854a..00000000000 --- a/mysql-test/t/3.23/rpl000010.test +++ /dev/null @@ -1,13 +0,0 @@ -#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; -connection slave; -drop table if exists foo; -connection master; -drop table if exists foo; -create table foo (n int not null auto_increment primary key); -insert into foo values(NULL); -insert into foo values(2); -connection slave; -sleep 5; -@r/3.23/rpl000010.result select n from foo; diff --git a/mysql-test/t/3.23/rpl000011.test b/mysql-test/t/3.23/rpl000011.test deleted file mode 100644 index a5759f52e09..00000000000 --- a/mysql-test/t/3.23/rpl000011.test +++ /dev/null @@ -1,18 +0,0 @@ -source t/include/master-slave.inc; -connection master; -use test; -drop table if exists foo; -create table foo (n int); -insert into foo values(1); -connection slave; -#give slave some breathing room to get started -sleep 1; -slave stop; -slave start; -connection master; -insert into foo values(2); -connection slave; -#let slave catch up -sleep 1; -@r/3.23/rpl000011.result select * from foo; - diff --git a/mysql-test/t/3.23/rpl000012.test b/mysql-test/t/3.23/rpl000012.test deleted file mode 100644 index 205c78d604c..00000000000 --- a/mysql-test/t/3.23/rpl000012.test +++ /dev/null @@ -1,19 +0,0 @@ -source t/include/master-slave.inc; -connection master; -drop table if exists x; -create table x(n int); -create temporary table t(n int); -insert into t values(1),(2),(3); -insert into x select * from t; -connection master1; -create temporary table t (n int); -insert into t values (4),(5); -insert into x select * from t; -disconnect master; -connection master1; -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'; diff --git a/mysql-test/t/3.23/rpl000013-slave.opt b/mysql-test/t/3.23/rpl000013-slave.opt deleted file mode 100644 index 2662c695b41..00000000000 --- a/mysql-test/t/3.23/rpl000013-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---abort-slave-event-count=1 diff --git a/mysql-test/t/3.23/rpl000013.test b/mysql-test/t/3.23/rpl000013.test deleted file mode 100644 index f54482f41e9..00000000000 --- a/mysql-test/t/3.23/rpl000013.test +++ /dev/null @@ -1,25 +0,0 @@ -source t/include/master-slave.inc; -connection master; -drop table if exists x; -create table x(n int); -create temporary table t(n int); -insert into t values(1),(2),(3); -insert into x select * from t; -connection master1; -create temporary table t (n int); -insert into t values (4),(5); -insert into x select * from t; -disconnect master; -connection master1; -insert into x values(6); -disconnect master1; -connection slave; -let $1=12; -while ($1) -{ - !slave start; - 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'; diff --git a/mysql-test/t/3.23/sel000001.test b/mysql-test/t/3.23/sel000001.test deleted file mode 100644 index 233e986ad3c..00000000000 --- a/mysql-test/t/3.23/sel000001.test +++ /dev/null @@ -1,17 +0,0 @@ -# sel000001 -# -# Versions -# -------- -# 3.22 -# 3.23 -# -# Description -# ----------- -# This test is just a simple select. -# Testing WHERE clause. -# - -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'; diff --git a/mysql-test/t/3.23/sel000002.test b/mysql-test/t/3.23/sel000002.test deleted file mode 100644 index 3a0178a05d4..00000000000 --- a/mysql-test/t/3.23/sel000002.test +++ /dev/null @@ -1,16 +0,0 @@ -# sel000002 -# -# Versions -# -------- -# 3.22 -# 3.23 -# -# Description -# ----------- -# This test is just a simple select. -# - -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; diff --git a/mysql-test/t/3.23/sel000003.test b/mysql-test/t/3.23/sel000003.test deleted file mode 100644 index 883be4fb079..00000000000 --- a/mysql-test/t/3.23/sel000003.test +++ /dev/null @@ -1,17 +0,0 @@ -# sel000003 -# -# Versions -# -------- -# 3.22 -# 3.23 -# -# Description -# ----------- -# This test is just a simple select. -# Testing count() function and GROUP BY clause. -# - -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; diff --git a/mysql-test/t/3.23/sel000004.test b/mysql-test/t/3.23/sel000004.test deleted file mode 100644 index 6146ff641e0..00000000000 --- a/mysql-test/t/3.23/sel000004.test +++ /dev/null @@ -1,21 +0,0 @@ -# sel000004 -# -# Versions -# -------- -# 3.22 -# 3.23 -# -# Description -# ----------- -# test for a bug with elt() and order by - -drop table if exists elt_ck1,elt_ck2; -create table elt_ck1 (id int(10) not null unique); -create table elt_ck2 (id int(10) not null primary key, -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 -where two.id=one.id order by one.id; - diff --git a/mysql-test/t/3.23/sel000005.test b/mysql-test/t/3.23/sel000005.test deleted file mode 100644 index 18541d5d69e..00000000000 --- a/mysql-test/t/3.23/sel000005.test +++ /dev/null @@ -1,21 +0,0 @@ -# sel000004 -# -# Versions -# -------- -# 3.22 -# 3.23 -# -# Description -# ----------- -# test for a bug with elt() - -drop table if exists elt_ck1,elt_ck2; -create table elt_ck1 (id int(10) not null unique); -create table elt_ck2 (id int(10) not null primary key, -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 -where two.id=one.id ; - diff --git a/mysql-test/t/3.23/sel000100.test b/mysql-test/t/3.23/sel000100.test deleted file mode 100644 index cd3f7005445..00000000000 --- a/mysql-test/t/3.23/sel000100.test +++ /dev/null @@ -1,30 +0,0 @@ -DROP TABLE IF EXISTS test1; -DROP TABLE IF EXISTS test2; - -CREATE TABLE test1 ( - ID int(11) NOT NULL auto_increment, - NAME varchar(75) DEFAULT '' NOT NULL, - LINK_ID int(11) DEFAULT '0' NOT NULL, - PRIMARY KEY (ID), - KEY NAME (NAME), - KEY LINK_ID (LINK_ID) -); - -INSERT INTO test1 (ID, NAME, LINK_ID) VALUES (1,'Mike',0); -INSERT INTO test1 (ID, NAME, LINK_ID) VALUES (2,'Jack',0); -INSERT INTO test1 (ID, NAME, LINK_ID) VALUES (3,'Bill',0); - -CREATE TABLE test2 ( - ID int(11) NOT NULL auto_increment, - NAME varchar(150) DEFAULT '' NOT NULL, - PRIMARY KEY (ID), - KEY NAME (NAME) -); - -@r/3.23/sel000100.result SELECT DISTINCT - test2.id AS key_link_id, - test2.name AS link -FROM test1 -LEFT JOIN test2 ON test1.link_id=test2.id -GROUP BY test1.id -ORDER BY link; diff --git a/mysql-test/t/3.23/shw000001.test b/mysql-test/t/3.23/shw000001.test deleted file mode 100644 index 0abb940d207..00000000000 --- a/mysql-test/t/3.23/shw000001.test +++ /dev/null @@ -1,7 +0,0 @@ -use test; -drop table if exists test; -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 ; diff --git a/mysql-test/t/README b/mysql-test/t/README new file mode 100644 index 00000000000..e69de29bb2d diff --git a/mysql-test/t/alt000001.test b/mysql-test/t/alt000001.test new file mode 100644 index 00000000000..88defc5b035 --- /dev/null +++ b/mysql-test/t/alt000001.test @@ -0,0 +1,6 @@ +use test; +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/alt000001.result select * from x; diff --git a/mysql-test/t/err000001.test b/mysql-test/t/err000001.test new file mode 100644 index 00000000000..f264c0bb172 --- /dev/null +++ b/mysql-test/t/err000001.test @@ -0,0 +1,3 @@ +use test; +drop table if exists foo; +!$1146 insert into foo values(1); diff --git a/mysql-test/t/ins000001.test b/mysql-test/t/ins000001.test new file mode 100644 index 00000000000..1c40d1ffa8d --- /dev/null +++ b/mysql-test/t/ins000001.test @@ -0,0 +1,11 @@ +use test; +drop table if exists emails; +drop table if exists domain; +drop table if exists domain; +create table emails (email varchar(50)); +insert into emails values ('sasha@mysql.com'),('monty@mysql.com'), +('foo@hotmail.com'),('foo@aol.com'),('bar@aol.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/ins000001.result select * from domain; diff --git a/mysql-test/t/rpl000001.test b/mysql-test/t/rpl000001.test new file mode 100644 index 00000000000..5bf0e0dbab5 --- /dev/null +++ b/mysql-test/t/rpl000001.test @@ -0,0 +1,15 @@ +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.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/rpl000001.a.result select * from foo; +@r/rpl000001.b.result select sum(length(word)) from words; + diff --git a/mysql-test/t/rpl000002.test b/mysql-test/t/rpl000002.test new file mode 100644 index 00000000000..29741b5b6cb --- /dev/null +++ b/mysql-test/t/rpl000002.test @@ -0,0 +1,11 @@ +source include/master-slave.inc; +connection master; +use test; +drop table if exists x; +create table x(n int auto_increment primary key); +set insert_id = 2000; +insert into x values (NULL),(NULL),(NULL); +connection slave; +use test; +sleep 0.5; +@r/rpl000002.result select * from x; diff --git a/mysql-test/t/rpl000003.test b/mysql-test/t/rpl000003.test new file mode 100644 index 00000000000..d7e21a3590a --- /dev/null +++ b/mysql-test/t/rpl000003.test @@ -0,0 +1,9 @@ +source include/master-slave.inc; +connection master; +drop table if exists x; +create table x(n int primary key); +!insert into x values (1),(2),(2); +insert into x values (3); +connection slave; +sleep 0.5; +@r/rpl000003.result select * from x; diff --git a/mysql-test/t/rpl000004.test b/mysql-test/t/rpl000004.test new file mode 100644 index 00000000000..b7ab81a0553 --- /dev/null +++ b/mysql-test/t/rpl000004.test @@ -0,0 +1,18 @@ +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.dat' into table words; +drop table if exists words1; +create table words1 (word char(20) not null); +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/rpl000004.a.result check table words; +@r/rpl000004.b.result select count(*) from words1; diff --git a/mysql-test/t/rpl000005.test b/mysql-test/t/rpl000005.test new file mode 100644 index 00000000000..944f701d765 --- /dev/null +++ b/mysql-test/t/rpl000005.test @@ -0,0 +1,12 @@ +source include/master-slave.inc; +connection master; +drop table if exists test; +CREATE TABLE test (name varchar(64), age smallint(3)); +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/rpl000005.result select * from test; +connection slave; +sleep 0.5; +@r/rpl000005.result select * from test; diff --git a/mysql-test/t/rpl000006.test b/mysql-test/t/rpl000006.test new file mode 100644 index 00000000000..56971cd049c --- /dev/null +++ b/mysql-test/t/rpl000006.test @@ -0,0 +1,12 @@ +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/rpl000006.result select unix_timestamp(t) from foo; +connection slave; +drop table if exists foo; +load table foo from master; +@r/rpl000006.result select unix_timestamp(t) from foo; diff --git a/mysql-test/t/rpl000007-slave.opt b/mysql-test/t/rpl000007-slave.opt new file mode 100644 index 00000000000..9ff99337d1f --- /dev/null +++ b/mysql-test/t/rpl000007-slave.opt @@ -0,0 +1 @@ +--replicate-do-table=test.bar diff --git a/mysql-test/t/rpl000007.test b/mysql-test/t/rpl000007.test new file mode 100644 index 00000000000..2a3748868d3 --- /dev/null +++ b/mysql-test/t/rpl000007.test @@ -0,0 +1,19 @@ +#this one assumes we are ignoring updates on table foo, but doing +#the ones on bar +source include/master-slave.inc; +connection slave; +use test; +drop table if exists foo; +create table foo (n int); +insert into foo values(4); +connection master; +use test; +drop table if exists foo; +create table foo (n int); +insert into foo values(5); +drop table if exists bar; +create table bar (m int); +insert into bar values(15); +connection slave; +sleep 1; +@r/rpl000007.result select foo.n,bar.m from foo,bar; diff --git a/mysql-test/t/rpl000008-slave.opt b/mysql-test/t/rpl000008-slave.opt new file mode 100644 index 00000000000..79b3bf6174b --- /dev/null +++ b/mysql-test/t/rpl000008-slave.opt @@ -0,0 +1 @@ +--replicate-ignore-table=test.foo diff --git a/mysql-test/t/rpl000008.test b/mysql-test/t/rpl000008.test new file mode 100644 index 00000000000..a50016ed9c0 --- /dev/null +++ b/mysql-test/t/rpl000008.test @@ -0,0 +1,22 @@ +#this one assumes we are ignoring updates on table foo, but doing +#the ones on all other tables +source include/master-slave.inc; +connection slave; +use test; +drop table if exists foo; +create table foo (n int); +insert into foo values(4); +connection master; +use test; +drop table if exists foo; +create table foo (n int); +insert into foo values(5); +drop table if exists bar; +create table bar (m int); +insert into bar values(15); +drop table if exists choo; +create table choo (k int); +insert into choo values(55); +connection slave; +sleep 1; +@r/rpl000008.result select foo.n,bar.m,choo.k from foo,bar,choo; diff --git a/mysql-test/t/rpl000009-slave.opt b/mysql-test/t/rpl000009-slave.opt new file mode 100644 index 00000000000..245e310c5d8 --- /dev/null +++ b/mysql-test/t/rpl000009-slave.opt @@ -0,0 +1 @@ +--replicate-wild-do-table=bar.% diff --git a/mysql-test/t/rpl000009.test b/mysql-test/t/rpl000009.test new file mode 100644 index 00000000000..0a872bb3663 --- /dev/null +++ b/mysql-test/t/rpl000009.test @@ -0,0 +1,23 @@ +#this one assumes we are ignoring updates on tables in database foo, but doing +#the ones in database bar +source include/master-slave.inc; +connection master; +drop database if exists foo; +create database foo; +drop database if exists bar; +create database bar; +connection slave; +sleep 1; +drop table if exists foo.foo; +create table foo.foo (n int); +insert into foo.foo values(4); +connection master; +drop table if exists foo.foo; +create table foo.foo (n int); +insert into foo.foo values(5); +drop table if exists bar.bar; +create table bar.bar (m int); +insert into bar.bar values(15); +connection slave; +sleep 1; +@r/rpl000009.result select foo.foo.n,bar.bar.m from foo.foo,bar.bar; diff --git a/mysql-test/t/rpl000010-slave.opt b/mysql-test/t/rpl000010-slave.opt new file mode 100644 index 00000000000..429a7f63f7b --- /dev/null +++ b/mysql-test/t/rpl000010-slave.opt @@ -0,0 +1 @@ +--disconnect-slave-event-count=1 diff --git a/mysql-test/t/rpl000010.test b/mysql-test/t/rpl000010.test new file mode 100644 index 00000000000..6b5ec69fb5f --- /dev/null +++ b/mysql-test/t/rpl000010.test @@ -0,0 +1,13 @@ +#this tests the offset off by 22 mystery bug +#must run slave with --disconnect-slave-event-count=1 --master-connect-retry=1 +source include/master-slave.inc; +connection slave; +drop table if exists foo; +connection master; +drop table if exists foo; +create table foo (n int not null auto_increment primary key); +insert into foo values(NULL); +insert into foo values(2); +connection slave; +sleep 5; +@r/rpl000010.result select n from foo; diff --git a/mysql-test/t/rpl000011.test b/mysql-test/t/rpl000011.test new file mode 100644 index 00000000000..f0776136541 --- /dev/null +++ b/mysql-test/t/rpl000011.test @@ -0,0 +1,18 @@ +source include/master-slave.inc; +connection master; +use test; +drop table if exists foo; +create table foo (n int); +insert into foo values(1); +connection slave; +#give slave some breathing room to get started +sleep 1; +slave stop; +slave start; +connection master; +insert into foo values(2); +connection slave; +#let slave catch up +sleep 1; +@r/rpl000011.result select * from foo; + diff --git a/mysql-test/t/rpl000012.test b/mysql-test/t/rpl000012.test new file mode 100644 index 00000000000..55d6bd4d4f2 --- /dev/null +++ b/mysql-test/t/rpl000012.test @@ -0,0 +1,19 @@ +source include/master-slave.inc; +connection master; +drop table if exists x; +create table x(n int); +create temporary table t(n int); +insert into t values(1),(2),(3); +insert into x select * from t; +connection master1; +create temporary table t (n int); +insert into t values (4),(5); +insert into x select * from t; +disconnect master; +connection master1; +insert into x values(6); +disconnect master1; +connection slave; +sleep 1; +@r/rpl000012.result select * from x; +@r/rpl000012.status.result show status like 'Slave_open_temp_tables'; diff --git a/mysql-test/t/rpl000013-slave.opt b/mysql-test/t/rpl000013-slave.opt new file mode 100644 index 00000000000..2662c695b41 --- /dev/null +++ b/mysql-test/t/rpl000013-slave.opt @@ -0,0 +1 @@ +--abort-slave-event-count=1 diff --git a/mysql-test/t/rpl000013.test b/mysql-test/t/rpl000013.test new file mode 100644 index 00000000000..ec015bbe357 --- /dev/null +++ b/mysql-test/t/rpl000013.test @@ -0,0 +1,25 @@ +source include/master-slave.inc; +connection master; +drop table if exists x; +create table x(n int); +create temporary table t(n int); +insert into t values(1),(2),(3); +insert into x select * from t; +connection master1; +create temporary table t (n int); +insert into t values (4),(5); +insert into x select * from t; +disconnect master; +connection master1; +insert into x values(6); +disconnect master1; +connection slave; +let $1=12; +while ($1) +{ + !slave start; + sleep 0.2; + dec $1; +} +@r/rpl000013.result select * from x; +@r/rpl000013.status.result show status like 'Slave_open_temp_tables'; diff --git a/mysql-test/t/sel000001.test b/mysql-test/t/sel000001.test new file mode 100644 index 00000000000..7f5fb303984 --- /dev/null +++ b/mysql-test/t/sel000001.test @@ -0,0 +1,17 @@ +# sel000001 +# +# Versions +# -------- +# 3.22 +# 3.23 +# +# Description +# ----------- +# This test is just a simple select. +# Testing WHERE clause. +# + +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/sel000001.result SELECT s, id FROM t WHERE s = 'mouse'; diff --git a/mysql-test/t/sel000002.test b/mysql-test/t/sel000002.test new file mode 100644 index 00000000000..27c88b503dc --- /dev/null +++ b/mysql-test/t/sel000002.test @@ -0,0 +1,16 @@ +# sel000002 +# +# Versions +# -------- +# 3.22 +# 3.23 +# +# Description +# ----------- +# This test is just a simple select. +# + +DROP TABLE IF EXISTS t; +CREATE TABLE t (n INT); +INSERT INTO t VALUES (1), (2), (3); +@r/sel000002.result SELECT * FROM t; diff --git a/mysql-test/t/sel000003.test b/mysql-test/t/sel000003.test new file mode 100644 index 00000000000..cef82ab2596 --- /dev/null +++ b/mysql-test/t/sel000003.test @@ -0,0 +1,17 @@ +# sel000003 +# +# Versions +# -------- +# 3.22 +# 3.23 +# +# Description +# ----------- +# This test is just a simple select. +# Testing count() function and GROUP BY clause. +# + +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/sel000003.result SELECT COUNT(*) as n, score FROM t GROUP BY score; diff --git a/mysql-test/t/sel000004.test b/mysql-test/t/sel000004.test new file mode 100644 index 00000000000..d7b59a9f99e --- /dev/null +++ b/mysql-test/t/sel000004.test @@ -0,0 +1,21 @@ +# sel000004 +# +# Versions +# -------- +# 3.22 +# 3.23 +# +# Description +# ----------- +# test for a bug with elt() and order by + +drop table if exists elt_ck1,elt_ck2; +create table elt_ck1 (id int(10) not null unique); +create table elt_ck2 (id int(10) not null primary key, +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/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/sel000005.test b/mysql-test/t/sel000005.test new file mode 100644 index 00000000000..d6dbb381654 --- /dev/null +++ b/mysql-test/t/sel000005.test @@ -0,0 +1,21 @@ +# sel000004 +# +# Versions +# -------- +# 3.22 +# 3.23 +# +# Description +# ----------- +# test for a bug with elt() + +drop table if exists elt_ck1,elt_ck2; +create table elt_ck1 (id int(10) not null unique); +create table elt_ck2 (id int(10) not null primary key, +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/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/sel000100.test b/mysql-test/t/sel000100.test new file mode 100644 index 00000000000..718e67de9ea --- /dev/null +++ b/mysql-test/t/sel000100.test @@ -0,0 +1,30 @@ +DROP TABLE IF EXISTS test1; +DROP TABLE IF EXISTS test2; + +CREATE TABLE test1 ( + ID int(11) NOT NULL auto_increment, + NAME varchar(75) DEFAULT '' NOT NULL, + LINK_ID int(11) DEFAULT '0' NOT NULL, + PRIMARY KEY (ID), + KEY NAME (NAME), + KEY LINK_ID (LINK_ID) +); + +INSERT INTO test1 (ID, NAME, LINK_ID) VALUES (1,'Mike',0); +INSERT INTO test1 (ID, NAME, LINK_ID) VALUES (2,'Jack',0); +INSERT INTO test1 (ID, NAME, LINK_ID) VALUES (3,'Bill',0); + +CREATE TABLE test2 ( + ID int(11) NOT NULL auto_increment, + NAME varchar(150) DEFAULT '' NOT NULL, + PRIMARY KEY (ID), + KEY NAME (NAME) +); + +@r/sel000100.result SELECT DISTINCT + test2.id AS key_link_id, + test2.name AS link +FROM test1 +LEFT JOIN test2 ON test1.link_id=test2.id +GROUP BY test1.id +ORDER BY link; diff --git a/mysql-test/t/shw000001.test b/mysql-test/t/shw000001.test new file mode 100644 index 00000000000..c92d710a49c --- /dev/null +++ b/mysql-test/t/shw000001.test @@ -0,0 +1,7 @@ +use test; +drop table if exists test; +create table test ( + test_set set( 'val1', 'val2', 'val3' ) not null default '', + name char(20) default 'O''Brien' + ) comment = 'it\'s a table' ; +@r/shw000001.result show create table test ; -- cgit v1.2.1