From ec1359416be7cec52f94dc4f7d6fabb2d406d416 Mon Sep 17 00:00:00 2001 From: "sasha@mysql.sashanet.com" <> 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 --- mysql-test/Makefile.am | 4 + mysql-test/include/master-slave.inc | 11 ++ mysql-test/install_test_db | 219 ++++++++++++++++++++++++++++++ mysql-test/mybin/mysql-test_install_db | 216 ----------------------------- mysql-test/mysql-test-run | 123 +++++++++++++---- mysql-test/r/3.23/alt000001.result | 5 - mysql-test/r/3.23/ins000001.result | 4 - mysql-test/r/3.23/rpl000001.a.result | 3 - mysql-test/r/3.23/rpl000001.b.result | 2 - mysql-test/r/3.23/rpl000002.result | 4 - mysql-test/r/3.23/rpl000003.result | 4 - mysql-test/r/3.23/rpl000004.a.result | 2 - mysql-test/r/3.23/rpl000004.b.result | 2 - mysql-test/r/3.23/rpl000005.result | 4 - mysql-test/r/3.23/rpl000006.result | 2 - mysql-test/r/3.23/rpl000007.result | 2 - mysql-test/r/3.23/rpl000008.result | 2 - mysql-test/r/3.23/rpl000009.result | 2 - mysql-test/r/3.23/rpl000010.result | 3 - mysql-test/r/3.23/rpl000011.result | 3 - mysql-test/r/3.23/rpl000012.result | 7 - mysql-test/r/3.23/rpl000012.status.result | 2 - mysql-test/r/3.23/rpl000013.result | 7 - mysql-test/r/3.23/rpl000013.status.result | 2 - mysql-test/r/3.23/sel000001.result | 2 - mysql-test/r/3.23/sel000002.result | 4 - mysql-test/r/3.23/sel000003.result | 3 - mysql-test/r/3.23/sel000004.result | 4 - mysql-test/r/3.23/sel000005.result | 4 - mysql-test/r/3.23/sel000006.result | 2 - mysql-test/r/3.23/sel000007.result | 2 - mysql-test/r/3.23/sel000008.result | 2 - mysql-test/r/3.23/sel000009.result | 2 - mysql-test/r/3.23/sel000010.result | 2 - mysql-test/r/3.23/sel000011.result | 2 - mysql-test/r/3.23/sel000012.result | 2 - mysql-test/r/3.23/sel000013.result | 2 - mysql-test/r/3.23/sel000014.result | 2 - mysql-test/r/3.23/sel000015.result | 2 - mysql-test/r/3.23/sel000016.result | 2 - mysql-test/r/3.23/sel000017.result | 2 - mysql-test/r/3.23/sel000018.result | 2 - mysql-test/r/3.23/sel000019.result | 2 - mysql-test/r/3.23/sel000020.result | 2 - mysql-test/r/3.23/sel000021.result | 2 - mysql-test/r/3.23/sel000022.result | 2 - mysql-test/r/3.23/sel000023.result | 2 - mysql-test/r/3.23/sel000024.result | 2 - mysql-test/r/3.23/sel000025.result | 2 - mysql-test/r/3.23/sel000026.result | 2 - mysql-test/r/3.23/sel000027.result | 2 - mysql-test/r/3.23/sel000028.result | 2 - mysql-test/r/3.23/sel000029.result | 2 - mysql-test/r/3.23/sel000030.result | 2 - mysql-test/r/3.23/sel000100.result | 2 - mysql-test/r/3.23/shw000001.result | 5 - mysql-test/r/alt000001.result | 5 + mysql-test/r/ins000001.result | 4 + mysql-test/r/rpl000001.a.result | 3 + mysql-test/r/rpl000001.b.result | 2 + mysql-test/r/rpl000002.result | 4 + mysql-test/r/rpl000003.result | 4 + mysql-test/r/rpl000004.a.result | 2 + mysql-test/r/rpl000004.b.result | 2 + mysql-test/r/rpl000005.result | 4 + mysql-test/r/rpl000006.result | 2 + mysql-test/r/rpl000007.result | 2 + mysql-test/r/rpl000008.result | 2 + mysql-test/r/rpl000009.result | 2 + mysql-test/r/rpl000010.result | 3 + mysql-test/r/rpl000011.result | 3 + mysql-test/r/rpl000012.result | 7 + mysql-test/r/rpl000012.status.result | 2 + mysql-test/r/rpl000013.result | 7 + mysql-test/r/rpl000013.status.result | 2 + mysql-test/r/sel000001.result | 2 + mysql-test/r/sel000002.result | 4 + mysql-test/r/sel000003.result | 3 + mysql-test/r/sel000004.result | 4 + mysql-test/r/sel000005.result | 4 + mysql-test/r/sel000006.result | 2 + mysql-test/r/sel000007.result | 2 + mysql-test/r/sel000008.result | 2 + mysql-test/r/sel000009.result | 2 + mysql-test/r/sel000010.result | 2 + mysql-test/r/sel000011.result | 2 + mysql-test/r/sel000012.result | 2 + mysql-test/r/sel000013.result | 2 + mysql-test/r/sel000014.result | 2 + mysql-test/r/sel000015.result | 2 + mysql-test/r/sel000016.result | 2 + mysql-test/r/sel000017.result | 2 + mysql-test/r/sel000018.result | 2 + mysql-test/r/sel000019.result | 2 + mysql-test/r/sel000020.result | 2 + mysql-test/r/sel000021.result | 2 + mysql-test/r/sel000022.result | 2 + mysql-test/r/sel000023.result | 2 + mysql-test/r/sel000024.result | 2 + mysql-test/r/sel000025.result | 2 + mysql-test/r/sel000026.result | 2 + mysql-test/r/sel000027.result | 2 + mysql-test/r/sel000028.result | 2 + mysql-test/r/sel000029.result | 2 + mysql-test/r/sel000030.result | 2 + mysql-test/r/sel000100.result | 2 + mysql-test/r/shw000001.result | 5 + mysql-test/std_data/words | 10 -- mysql-test/std_data/words.dat | 10 ++ 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 + 167 files changed, 846 insertions(+), 759 deletions(-) create mode 100644 mysql-test/Makefile.am create mode 100644 mysql-test/include/master-slave.inc create mode 100755 mysql-test/install_test_db delete mode 100755 mysql-test/mybin/mysql-test_install_db delete mode 100644 mysql-test/r/3.23/alt000001.result delete mode 100644 mysql-test/r/3.23/ins000001.result delete mode 100644 mysql-test/r/3.23/rpl000001.a.result delete mode 100644 mysql-test/r/3.23/rpl000001.b.result delete mode 100644 mysql-test/r/3.23/rpl000002.result delete mode 100644 mysql-test/r/3.23/rpl000003.result delete mode 100644 mysql-test/r/3.23/rpl000004.a.result delete mode 100644 mysql-test/r/3.23/rpl000004.b.result delete mode 100644 mysql-test/r/3.23/rpl000005.result delete mode 100644 mysql-test/r/3.23/rpl000006.result delete mode 100644 mysql-test/r/3.23/rpl000007.result delete mode 100644 mysql-test/r/3.23/rpl000008.result delete mode 100644 mysql-test/r/3.23/rpl000009.result delete mode 100644 mysql-test/r/3.23/rpl000010.result delete mode 100644 mysql-test/r/3.23/rpl000011.result delete mode 100644 mysql-test/r/3.23/rpl000012.result delete mode 100644 mysql-test/r/3.23/rpl000012.status.result delete mode 100644 mysql-test/r/3.23/rpl000013.result delete mode 100644 mysql-test/r/3.23/rpl000013.status.result delete mode 100644 mysql-test/r/3.23/sel000001.result delete mode 100644 mysql-test/r/3.23/sel000002.result delete mode 100644 mysql-test/r/3.23/sel000003.result delete mode 100644 mysql-test/r/3.23/sel000004.result delete mode 100644 mysql-test/r/3.23/sel000005.result delete mode 100644 mysql-test/r/3.23/sel000006.result delete mode 100644 mysql-test/r/3.23/sel000007.result delete mode 100644 mysql-test/r/3.23/sel000008.result delete mode 100644 mysql-test/r/3.23/sel000009.result delete mode 100644 mysql-test/r/3.23/sel000010.result delete mode 100644 mysql-test/r/3.23/sel000011.result delete mode 100644 mysql-test/r/3.23/sel000012.result delete mode 100644 mysql-test/r/3.23/sel000013.result delete mode 100644 mysql-test/r/3.23/sel000014.result delete mode 100644 mysql-test/r/3.23/sel000015.result delete mode 100644 mysql-test/r/3.23/sel000016.result delete mode 100644 mysql-test/r/3.23/sel000017.result delete mode 100644 mysql-test/r/3.23/sel000018.result delete mode 100644 mysql-test/r/3.23/sel000019.result delete mode 100644 mysql-test/r/3.23/sel000020.result delete mode 100644 mysql-test/r/3.23/sel000021.result delete mode 100644 mysql-test/r/3.23/sel000022.result delete mode 100644 mysql-test/r/3.23/sel000023.result delete mode 100644 mysql-test/r/3.23/sel000024.result delete mode 100644 mysql-test/r/3.23/sel000025.result delete mode 100644 mysql-test/r/3.23/sel000026.result delete mode 100644 mysql-test/r/3.23/sel000027.result delete mode 100644 mysql-test/r/3.23/sel000028.result delete mode 100644 mysql-test/r/3.23/sel000029.result delete mode 100644 mysql-test/r/3.23/sel000030.result delete mode 100644 mysql-test/r/3.23/sel000100.result delete mode 100644 mysql-test/r/3.23/shw000001.result create mode 100644 mysql-test/r/alt000001.result create mode 100644 mysql-test/r/ins000001.result create mode 100644 mysql-test/r/rpl000001.a.result create mode 100644 mysql-test/r/rpl000001.b.result create mode 100644 mysql-test/r/rpl000002.result create mode 100644 mysql-test/r/rpl000003.result create mode 100644 mysql-test/r/rpl000004.a.result create mode 100644 mysql-test/r/rpl000004.b.result create mode 100644 mysql-test/r/rpl000005.result create mode 100644 mysql-test/r/rpl000006.result create mode 100644 mysql-test/r/rpl000007.result create mode 100644 mysql-test/r/rpl000008.result create mode 100644 mysql-test/r/rpl000009.result create mode 100644 mysql-test/r/rpl000010.result create mode 100644 mysql-test/r/rpl000011.result create mode 100644 mysql-test/r/rpl000012.result create mode 100644 mysql-test/r/rpl000012.status.result create mode 100644 mysql-test/r/rpl000013.result create mode 100644 mysql-test/r/rpl000013.status.result create mode 100644 mysql-test/r/sel000001.result create mode 100644 mysql-test/r/sel000002.result create mode 100644 mysql-test/r/sel000003.result create mode 100644 mysql-test/r/sel000004.result create mode 100644 mysql-test/r/sel000005.result create mode 100644 mysql-test/r/sel000006.result create mode 100644 mysql-test/r/sel000007.result create mode 100644 mysql-test/r/sel000008.result create mode 100644 mysql-test/r/sel000009.result create mode 100644 mysql-test/r/sel000010.result create mode 100644 mysql-test/r/sel000011.result create mode 100644 mysql-test/r/sel000012.result create mode 100644 mysql-test/r/sel000013.result create mode 100644 mysql-test/r/sel000014.result create mode 100644 mysql-test/r/sel000015.result create mode 100644 mysql-test/r/sel000016.result create mode 100644 mysql-test/r/sel000017.result create mode 100644 mysql-test/r/sel000018.result create mode 100644 mysql-test/r/sel000019.result create mode 100644 mysql-test/r/sel000020.result create mode 100644 mysql-test/r/sel000021.result create mode 100644 mysql-test/r/sel000022.result create mode 100644 mysql-test/r/sel000023.result create mode 100644 mysql-test/r/sel000024.result create mode 100644 mysql-test/r/sel000025.result create mode 100644 mysql-test/r/sel000026.result create mode 100644 mysql-test/r/sel000027.result create mode 100644 mysql-test/r/sel000028.result create mode 100644 mysql-test/r/sel000029.result create mode 100644 mysql-test/r/sel000030.result create mode 100644 mysql-test/r/sel000100.result create mode 100644 mysql-test/r/shw000001.result delete mode 100644 mysql-test/std_data/words create mode 100644 mysql-test/std_data/words.dat 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') diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am new file mode 100644 index 00000000000..3d114e9dd27 --- /dev/null +++ b/mysql-test/Makefile.am @@ -0,0 +1,4 @@ +EXTRA_DIST=README README.gcov mysql-test-run t/*.test t/*.opt r/*.result \ +mybin/mysql-test_install_db mybin/start-mysqld mybin/stop-mysqld \ +mybin/translate-tests + diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc new file mode 100644 index 00000000000..137749912a7 --- /dev/null +++ b/mysql-test/include/master-slave.inc @@ -0,0 +1,11 @@ +connect (master,localhost,root,,test,0,var/tmp/mysql.sock); +connect (master1,localhost,root,,test,0,var/tmp/mysql.sock); +connect (slave,localhost,root,,test,0,var/tmp/mysql-slave.sock); +connect (slave1,localhost,root,,test,0,var/tmp/mysql-slave.sock); +connection slave; +!slave stop; +connection master; +reset master; +connection slave; +reset slave; +!slave start; diff --git a/mysql-test/install_test_db b/mysql-test/install_test_db new file mode 100755 index 00000000000..be037b06538 --- /dev/null +++ b/mysql-test/install_test_db @@ -0,0 +1,219 @@ +#!/bin/sh +# Copyright (C) 1997, 1998, 1999 TCX DataKonsult AB & Monty Program KB & Detron HB +# For a more info consult the file COPYRIGHT distributed with this file + +# This scripts creates the privilege tables db, host, user, tables_priv, +# columns_priv in the mysql database, as well as the func table. + +if [ x$1 = x"-bin" ]; then + shift 1 + execdir=../bin + bindir=../bin + BINARY_DIST=1 + fix_bin=mysql-test +else + execdir=../sql + bindir=../client + fix_bin=. +fi + +if [ x$1 = x"-slave" ] +then + shift 1 + data=var/slave-data + ldata=$fix_bin/var/slave-data + logdir=var/log +else + data=var/lib + ldata=$fix_bin/var/lib + logdir=var/log +fi + +mdata=$data/mysql + + +if test ! -x $execdir/mysqld +then + echo "mysqld is missing - looked in $execdir" + exit 1 +fi + +# On IRIX hostname is in /usr/bsd so add this to the path +PATH=$PATH:/usr/bsd +hostname=`hostname` # Install this too in the user table + +resolved=127.0.0.1 + + +# Create database directories mysql & test +if [ -d $data ] ; then rm -rf $data ; fi +mkdir -p $data $data/mysql $data/test + +#for error messages +if [ x$BINARY_DIST = x1 ] ; then +basedir=.. +else +basedir=. +rm -rf share +mkdir share +ln -sf ../../sql/share share/mysql +fi + +#create the directory for logs +mkdir -p $logdir + +# Initialize variables +c_d="" i_d="" +c_h="" i_h="" +c_u="" i_u="" +c_f="" i_f="" +c_t="" c_c="" + +# Check for old tables +if test ! -f $mdata/db.frm +then + # mysqld --bootstrap wants one command/line + c_d="$c_d CREATE TABLE db (" + c_d="$c_d Host char(60) DEFAULT '' NOT NULL," + c_d="$c_d Db char(64) DEFAULT '' NOT NULL," + c_d="$c_d User char(16) DEFAULT '' NOT NULL," + c_d="$c_d Select_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_d="$c_d Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_d="$c_d Update_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_d="$c_d Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_d="$c_d Create_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_d="$c_d Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_d="$c_d Grant_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_d="$c_d References_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_d="$c_d Index_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_d="$c_d Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_d="$c_d PRIMARY KEY Host (Host,Db,User)," + c_d="$c_d KEY User (User)" + c_d="$c_d )" + c_d="$c_d comment='Database privileges';" + + i_d="INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y'); + INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y');" +fi + +if test ! -f $mdata/host.frm +then + c_h="$c_h CREATE TABLE host (" + c_h="$c_h Host char(60) DEFAULT '' NOT NULL," + c_h="$c_h Db char(64) DEFAULT '' NOT NULL," + c_h="$c_h Select_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_h="$c_h Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_h="$c_h Update_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_h="$c_h Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_h="$c_h Create_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_h="$c_h Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_h="$c_h Grant_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_h="$c_h References_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_h="$c_h Index_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_h="$c_h Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_h="$c_h PRIMARY KEY Host (Host,Db)" + c_h="$c_h )" + c_h="$c_h comment='Host privileges; Merged with database privileges';" +fi + +if test ! -f $mdata/user.frm +then + c_u="$c_u CREATE TABLE user (" + c_u="$c_u Host char(60) DEFAULT '' NOT NULL," + c_u="$c_u User char(16) DEFAULT '' NOT NULL," + c_u="$c_u Password char(16) DEFAULT '' NOT NULL," + c_u="$c_u Select_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_u="$c_u Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_u="$c_u Update_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_u="$c_u Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_u="$c_u Create_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_u="$c_u Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_u="$c_u Reload_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_u="$c_u Shutdown_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_u="$c_u Process_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_u="$c_u File_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_u="$c_u Grant_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_u="$c_u References_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_u="$c_u Index_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_u="$c_u Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_u="$c_u PRIMARY KEY Host (Host,User)" + c_u="$c_u )" + c_u="$c_u comment='Users and global privileges';" + + i_u="INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + + REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + + INSERT INTO user VALUES ('localhost','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N'); + INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N');" +fi + +if test ! -f $mdata/func.frm +then + c_f="$c_f CREATE TABLE func (" + c_f="$c_f name char(64) DEFAULT '' NOT NULL," + c_f="$c_f ret tinyint(1) DEFAULT '0' NOT NULL," + c_f="$c_f dl char(128) DEFAULT '' NOT NULL," + c_f="$c_f type enum ('function','aggregate') NOT NULL," + c_f="$c_f PRIMARY KEY (name)" + c_f="$c_f )" + c_f="$c_f comment='User defined functions';" +fi + +if test ! -f $mdata/tables_priv.frm +then + c_t="$c_t CREATE TABLE tables_priv (" + c_t="$c_t Host char(60) DEFAULT '' NOT NULL," + c_t="$c_t Db char(64) DEFAULT '' NOT NULL," + c_t="$c_t User char(16) DEFAULT '' NOT NULL," + c_t="$c_t Table_name char(60) DEFAULT '' NOT NULL," + c_t="$c_t Grantor char(77) DEFAULT '' NOT NULL," + c_t="$c_t Timestamp timestamp(14)," + c_t="$c_t Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') DEFAULT '' NOT NULL," + c_t="$c_t Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL," + c_t="$c_t PRIMARY KEY (Host,Db,User,Table_name)," + c_t="$c_t KEY Grantor (Grantor)" + c_t="$c_t )" + c_t="$c_t comment='Table privileges';" +fi + +if test ! -f $mdata/columns_priv.frm +then + c_c="$c_c CREATE TABLE columns_priv (" + c_c="$c_c Host char(60) DEFAULT '' NOT NULL," + c_c="$c_c Db char(64) DEFAULT '' NOT NULL," + c_c="$c_c User char(16) DEFAULT '' NOT NULL," + c_c="$c_c Table_name char(64) DEFAULT '' NOT NULL," + c_c="$c_c Column_name char(64) DEFAULT '' NOT NULL," + c_c="$c_c Timestamp timestamp(14)," + c_c="$c_c Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL," + c_c="$c_c PRIMARY KEY (Host,Db,User,Table_name,Column_name)" + c_c="$c_c )" + c_c="$c_c comment='Column privileges';" +fi + +if $execdir/mysqld --no-defaults --bootstrap --skip-grant-tables \ + --basedir=$basedir --datadir=$ldata << END_OF_DATA +use mysql; +$c_d +$i_d + +$c_h +$i_h + +$c_u +$i_u + +$c_f +$i_f + +$c_t +$c_c +END_OF_DATA +then + exit 0 +else + exit 1 +fi diff --git a/mysql-test/mybin/mysql-test_install_db b/mysql-test/mybin/mysql-test_install_db deleted file mode 100755 index c5e6c43cc71..00000000000 --- a/mysql-test/mybin/mysql-test_install_db +++ /dev/null @@ -1,216 +0,0 @@ -#!/bin/sh -# Copyright (C) 1997, 1998, 1999 TCX DataKonsult AB & Monty Program KB & Detron HB -# For a more info consult the file COPYRIGHT distributed with this file - -# This scripts creates the privilege tables db, host, user, tables_priv, -# columns_priv in the mysql database, as well as the func table. - - -if [ x$1 = x"-slave" ] -then - shift $# - ldata=var/slave-data - logdir=var/log - mdata=$ldata/mysql - execdir=../sql - bindir=../client -else - ldata=var/lib - logdir=var/log - mdata=$ldata/mysql - execdir=../sql - bindir=../client -fi - -if test ! -x $execdir/mysqld -then - echo "I can't find no stinking mysqld!" - exit 1 -fi - -# On IRIX hostname is in /usr/bsd so add this to the path -PATH=$PATH:/usr/bsd -hostname=`hostname` # Install this too in the user table - -resolved=127.0.0.1 - - -# Create database directories mysql & test -if test ! -d $ldata; then (mkdir -p $ldata || exit 1) && \ - (chmod 700 $ldata || exit 1) ; fi -if test ! -d $ldata/mysql; -then - mkdir -p $ldata/mysql || exit 1; - chmod 700 $ldata/mysql || exit 1 ; fi -if test ! -d $ldata/test; -then - mkdir -p $ldata/test || exit 1; - chmod 700 $ldata/test || exit 1 ; - fi -if test -w / -a ! -z "$user"; then - chown $user $ldata $ldata/mysql $ldata/test || exit 1; -fi - -#for error messages -rm -rf share -mkdir share -ln -sf ../../sql/share share/mysql - -#create the directory for logs -mkdir -p $logdir - -# Initialize variables -c_d="" i_d="" -c_h="" i_h="" -c_u="" i_u="" -c_f="" i_f="" -c_t="" c_c="" - -# Check for old tables -if test ! -f $mdata/db.frm -then - # mysqld --bootstrap wants one command/line - c_d="$c_d CREATE TABLE db (" - c_d="$c_d Host char(60) DEFAULT '' NOT NULL," - c_d="$c_d Db char(64) DEFAULT '' NOT NULL," - c_d="$c_d User char(16) DEFAULT '' NOT NULL," - c_d="$c_d Select_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_d="$c_d Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_d="$c_d Update_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_d="$c_d Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_d="$c_d Create_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_d="$c_d Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_d="$c_d Grant_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_d="$c_d References_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_d="$c_d Index_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_d="$c_d Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_d="$c_d PRIMARY KEY Host (Host,Db,User)," - c_d="$c_d KEY User (User)" - c_d="$c_d )" - c_d="$c_d comment='Database privileges';" - - i_d="INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y'); - INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y');" -fi - -if test ! -f $mdata/host.frm -then - c_h="$c_h CREATE TABLE host (" - c_h="$c_h Host char(60) DEFAULT '' NOT NULL," - c_h="$c_h Db char(64) DEFAULT '' NOT NULL," - c_h="$c_h Select_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_h="$c_h Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_h="$c_h Update_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_h="$c_h Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_h="$c_h Create_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_h="$c_h Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_h="$c_h Grant_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_h="$c_h References_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_h="$c_h Index_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_h="$c_h Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_h="$c_h PRIMARY KEY Host (Host,Db)" - c_h="$c_h )" - c_h="$c_h comment='Host privileges; Merged with database privileges';" -fi - -if test ! -f $mdata/user.frm -then - c_u="$c_u CREATE TABLE user (" - c_u="$c_u Host char(60) DEFAULT '' NOT NULL," - c_u="$c_u User char(16) DEFAULT '' NOT NULL," - c_u="$c_u Password char(16) DEFAULT '' NOT NULL," - c_u="$c_u Select_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_u="$c_u Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_u="$c_u Update_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_u="$c_u Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_u="$c_u Create_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_u="$c_u Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_u="$c_u Reload_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_u="$c_u Shutdown_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_u="$c_u Process_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_u="$c_u File_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_u="$c_u Grant_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_u="$c_u References_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_u="$c_u Index_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_u="$c_u Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_u="$c_u PRIMARY KEY Host (Host,User)" - c_u="$c_u )" - c_u="$c_u comment='Users and global privileges';" - - i_u="INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - - REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - - INSERT INTO user VALUES ('localhost','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N'); - INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N');" -fi - -if test ! -f $mdata/func.frm -then - c_f="$c_f CREATE TABLE func (" - c_f="$c_f name char(64) DEFAULT '' NOT NULL," - c_f="$c_f ret tinyint(1) DEFAULT '0' NOT NULL," - c_f="$c_f dl char(128) DEFAULT '' NOT NULL," - c_f="$c_f type enum ('function','aggregate') NOT NULL," - c_f="$c_f PRIMARY KEY (name)" - c_f="$c_f )" - c_f="$c_f comment='User defined functions';" -fi - -if test ! -f $mdata/tables_priv.frm -then - c_t="$c_t CREATE TABLE tables_priv (" - c_t="$c_t Host char(60) DEFAULT '' NOT NULL," - c_t="$c_t Db char(64) DEFAULT '' NOT NULL," - c_t="$c_t User char(16) DEFAULT '' NOT NULL," - c_t="$c_t Table_name char(60) DEFAULT '' NOT NULL," - c_t="$c_t Grantor char(77) DEFAULT '' NOT NULL," - c_t="$c_t Timestamp timestamp(14)," - c_t="$c_t Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') DEFAULT '' NOT NULL," - c_t="$c_t Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL," - c_t="$c_t PRIMARY KEY (Host,Db,User,Table_name)," - c_t="$c_t KEY Grantor (Grantor)" - c_t="$c_t )" - c_t="$c_t comment='Table privileges';" -fi - -if test ! -f $mdata/columns_priv.frm -then - c_c="$c_c CREATE TABLE columns_priv (" - c_c="$c_c Host char(60) DEFAULT '' NOT NULL," - c_c="$c_c Db char(64) DEFAULT '' NOT NULL," - c_c="$c_c User char(16) DEFAULT '' NOT NULL," - c_c="$c_c Table_name char(64) DEFAULT '' NOT NULL," - c_c="$c_c Column_name char(64) DEFAULT '' NOT NULL," - c_c="$c_c Timestamp timestamp(14)," - c_c="$c_c Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL," - c_c="$c_c PRIMARY KEY (Host,Db,User,Table_name,Column_name)" - c_c="$c_c )" - c_c="$c_c comment='Column privileges';" -fi - -if $execdir/mysqld --no-defaults --bootstrap --skip-grant-tables \ - --basedir=. --datadir=$ldata << END_OF_DATA -use mysql; -$c_d -$i_d - -$c_h -$i_h - -$c_u -$i_u - -$c_f -$i_f - -$c_t -$c_c -END_OF_DATA -then - exit 0 -else - exit 1 -fi diff --git a/mysql-test/mysql-test-run b/mysql-test/mysql-test-run index 740f10f1cad..d2d99724aa4 100755 --- a/mysql-test/mysql-test-run +++ b/mysql-test/mysql-test-run @@ -1,4 +1,6 @@ #! /bin/sh +# mysql-test-run - originally written by Matt Wagner +# modified by Sasha Pachev #++ # Access Definitions @@ -7,17 +9,42 @@ DB=test DBUSER=test DBPASSWD= +# Are we on source or binary distribution? + +if [ $0 = scripts/mysql-test-run ] ; +then + BINARY_DIST=1 + cd mysql-test +else + if [ -d mysql-test ] ; then + cd mysql-test + fi + + if [ -f ./mysql-test-run ] && [ -d ../sql ] ; then + SOURCE_DIST=1 + else + echo "If you are using binary distirubution, run me from install root as \ + scripts/mysql-test-run. On source distribution run me from source root as \ + mysql-test/mysql-test-run or from mysql-test as ./mysql-test-run" + exit 1 + fi + +fi + + #++ # Misc. Definitions #-- + +#BASEDIR is always one above mysql-test directory CWD=`pwd` cd .. BASEDIR=`pwd` cd $CWD -MYBIN="$CWD/mybin" -TESTVER=3.23 -TESTDIR="$CWD/t/$TESTVER" +MYSQL_TEST_DIR=$BASEDIR/mysql-test + +TESTDIR="$MYSQL_TEST_DIR/t/" TESTSUFFIX=test TOT_PASS=0 TOT_FAIL=0 @@ -25,8 +52,8 @@ TOT_TEST=0 USERT=0 SYST=0 REALT=0 -MY_TMP_DIR=$CWD/var/tmp -TIMEFILE="$CWD/var/tmp/mysqltest-time" +MY_TMP_DIR=$MYSQL_TEST_DIR/var/tmp +TIMEFILE="$MYSQL_TEST_DIR/var/tmp/mysqltest-time" DASHBLANK="---- ---- -------" MYSQLD_SRC_DIRS="strings mysys include extra regex isam merge myisam \ myisammrg heap sql" @@ -53,18 +80,25 @@ done #-- MYRUN_DIR=var/run MASTER_MYPORT=9306 -MASTER_MYDDIR="$CWD/var/lib" -MASTER_MYSOCK="$CWD/var/tmp/mysql.sock" -MASTER_MYPID="$CWD/var/run/mysqld.pid" -MASTER_MYLOG="$CWD/var/log/mysqld.log" -MASTER_MYERR="$CWD/var/log/mysqld.err" +MASTER_MYDDIR="$MYSQL_TEST_DIR/var/lib" +MASTER_MYSOCK="$MYSQL_TEST_DIR/var/tmp/mysql.sock" +MASTER_MYPID="$MYSQL_TEST_DIR/var/run/mysqld.pid" +MASTER_MYLOG="$MYSQL_TEST_DIR/var/log/mysqld.log" +MASTER_MYERR="$MYSQL_TEST_DIR/var/log/mysqld.err" + SLAVE_MYPORT=9307 -SLAVE_MYDDIR="$CWD/var/slave-data" -SLAVE_MYSOCK="$CWD/var/tmp/mysql-slave.sock" -SLAVE_MYPID="$CWD/var/run/mysqld-slave.pid" -SLAVE_MYLOG="$CWD/var/log/mysqld-slave.log" -SLAVE_MYERR="$CWD/var/log/mysqld-slave.err" +SLAVE_MYDDIR="$MYSQL_TEST_DIR/var/slave-data" +SLAVE_MYSOCK="$MYSQL_TEST_DIR/var/tmp/mysql-slave.sock" +SLAVE_MYPID="$MYSQL_TEST_DIR/var/run/mysqld-slave.pid" +SLAVE_MYLOG="$MYSQL_TEST_DIR/var/log/mysqld-slave.log" +SLAVE_MYERR="$MYSQL_TEST_DIR/var/log/mysqld-slave.err" + +if [ x$SOURCE_DIST = x1 ] ; then + MY_BASEDIR=$MYSQL_TEST_DIR +else + MY_BASEDIR=$BASEDIR +fi #++ # Program Definitions @@ -81,22 +115,50 @@ RM=/bin/rm TIME=/usr/bin/time TR=/usr/bin/tr XARGS=`which xargs` -MYSQLD="$BASEDIR/sql/mysqld" -MYSQL_TEST="$BASEDIR/client/mysqltest" -MYSQLADMIN="$BASEDIR/client/mysqladmin" + +# on source dist, we pick up freshly build executables +# on binary, use what is installed +if [ x$SOURCE_DIST = x1 ] ; then + MYSQLD="$BASEDIR/sql/mysqld" + MYSQL_TEST="$BASEDIR/client/mysqltest" + MYSQLADMIN="$BASEDIR/client/mysqladmin" + INSTALL_DB="./install_test_db" +else + MYSQLD="$BASEDIR/bin/mysqld" + MYSQL_TEST="$BASEDIR/bin/mysqltest" + MYSQLADMIN="$BASEDIR/bin/mysqladmin" + INSTALL_DB="../scripts/install_test_db -bin" +fi + + + MYSQL_TEST="$MYSQL_TEST --socket=$MASTER_MYSOCK --database=$DB --user=$DBUSER --password=$DBPASSWD --silent" -INSTALL_DB="$MYBIN/mysql-test_install_db" GDB_MASTER_INIT=/tmp/gdbinit.master GDB_SLAVE_INIT=/tmp/gdbinit.slave +if [ "$1" = "-force" ] ; then + FORCE=1 + shift 1 +fi + if [ "$1" = "-gcov" ]; then + if [ x$BINARY_DIST = x1 ] ; then + echo "Cannot do coverage test without the source - please us source dist" + exit 1 + fi DO_GCOV=1 shift 1 fi if [ "$1" = "-gdb" ]; then +# if the user really wanted to run binary dist in a debugger, he can +# but we should warn him + if [ x$BINARY_DIST = x1 ] ; then + echo "Note: you will get more meaningful output on a source distribution \ + compiled with debugging option when running tests with -gdb option" + fi DO_GDB=1 shift 1 fi @@ -147,7 +209,7 @@ echo_pass () { prompt_user () { echo $1 - read + read unused } echo_fail () { @@ -224,7 +286,7 @@ gcov_prepare () { for f in *.h *.cc *.c; do cp $f $GCOV_SLAVE_SRC/$d done - cd $CWD + cd $MYSQL_TEST_DIR done } @@ -239,12 +301,12 @@ gcov_collect () { for f in *.h *.cc *.c; do $GCOV $f 2>>$GCOV_MASTER_ERR >>$GCOV_MASTER_MSG done - cd $CWD + cd $MYSQL_TEST_DIR cd $GCOV_SLAVE_SRC/$d for f in *.h *.cc *.c; do $GCOV $f 2>>$GCOV_SLAVE_ERR >>$GCOV_SLAVE_MSG done - cd $CWD + cd $MYSQL_TEST_DIR done $ECHO "gcov master info in $GCOV_MASTER_MSG, errors in $GCOV_MASTER_ERR" @@ -257,7 +319,7 @@ start_master() #start master master_args="--no-defaults --log-bin \ --server-id=1 \ - --basedir=$CWD \ + --basedir=$MY_BASEDIR \ --port=$MASTER_MYPORT \ --core-file \ --datadir=$MASTER_MYDDIR \ @@ -286,7 +348,7 @@ start_slave() --master-host=127.0.0.1 \ --master-port=$MASTER_MYPORT \ --core-file \ - --basedir=$CWD \ + --basedir=$MY_BASEDIR \ --datadir=$SLAVE_MYDDIR \ --pid-file=$SLAVE_MYPID \ --port=$SLAVE_MYPORT \ @@ -307,7 +369,7 @@ start_slave() mysql_start () { start_master start_slave - cd $CWD + cd $MYSQL_TEST_DIR return 1 } @@ -394,7 +456,7 @@ run_testcase () fi fi - cd $CWD + cd $MYSQL_TEST_DIR if [ -f $tf ] ; then mytime=`$TIME -p $MYSQL_TEST < $tf 2> $TIMEFILE` @@ -425,6 +487,13 @@ run_testcase () $CAT $TIMEFILE $ECHO $ECHO + if [ x$FORCE != x1 ] ; then + $SETCOLOR_NORMAL + echo "Aborting, if you want to continue, re-run with -force" + mysql_stop + exit 1 + fi + $SETCOLOR_NORMAL && $ECHO -n "Restarting mysqld $DASHBLANK" mysql_restart $SETCOLOR_SUCCESS && echo_ok diff --git a/mysql-test/r/3.23/alt000001.result b/mysql-test/r/3.23/alt000001.result deleted file mode 100644 index cc95b808d23..00000000000 --- a/mysql-test/r/3.23/alt000001.result +++ /dev/null @@ -1,5 +0,0 @@ -n -3 -9 -10 -12 diff --git a/mysql-test/r/3.23/ins000001.result b/mysql-test/r/3.23/ins000001.result deleted file mode 100644 index 1003b3b6b18..00000000000 --- a/mysql-test/r/3.23/ins000001.result +++ /dev/null @@ -1,4 +0,0 @@ -id domain -1 mysql.com -2 hotmail.com -3 aol.com diff --git a/mysql-test/r/3.23/rpl000001.a.result b/mysql-test/r/3.23/rpl000001.a.result deleted file mode 100644 index 982e0523cfb..00000000000 --- a/mysql-test/r/3.23/rpl000001.a.result +++ /dev/null @@ -1,3 +0,0 @@ -n -1 -2 diff --git a/mysql-test/r/3.23/rpl000001.b.result b/mysql-test/r/3.23/rpl000001.b.result deleted file mode 100644 index 17cdaf46fa6..00000000000 --- a/mysql-test/r/3.23/rpl000001.b.result +++ /dev/null @@ -1,2 +0,0 @@ -sum(length(word)) -71 diff --git a/mysql-test/r/3.23/rpl000002.result b/mysql-test/r/3.23/rpl000002.result deleted file mode 100644 index c76fc46ae97..00000000000 --- a/mysql-test/r/3.23/rpl000002.result +++ /dev/null @@ -1,4 +0,0 @@ -n -2000 -2001 -2002 diff --git a/mysql-test/r/3.23/rpl000003.result b/mysql-test/r/3.23/rpl000003.result deleted file mode 100644 index c62967af0bb..00000000000 --- a/mysql-test/r/3.23/rpl000003.result +++ /dev/null @@ -1,4 +0,0 @@ -n -1 -2 -3 diff --git a/mysql-test/r/3.23/rpl000004.a.result b/mysql-test/r/3.23/rpl000004.a.result deleted file mode 100644 index 4061fdb4a0d..00000000000 --- a/mysql-test/r/3.23/rpl000004.a.result +++ /dev/null @@ -1,2 +0,0 @@ -Table Op Msg_type Msg_text -test.words check status OK diff --git a/mysql-test/r/3.23/rpl000004.b.result b/mysql-test/r/3.23/rpl000004.b.result deleted file mode 100644 index c71e0b46471..00000000000 --- a/mysql-test/r/3.23/rpl000004.b.result +++ /dev/null @@ -1,2 +0,0 @@ -count(*) -10 diff --git a/mysql-test/r/3.23/rpl000005.result b/mysql-test/r/3.23/rpl000005.result deleted file mode 100644 index 763154b938e..00000000000 --- a/mysql-test/r/3.23/rpl000005.result +++ /dev/null @@ -1,4 +0,0 @@ -name age id -Andy 31 00000001 -Jacob 2 00000002 -Caleb 1 00000003 diff --git a/mysql-test/r/3.23/rpl000006.result b/mysql-test/r/3.23/rpl000006.result deleted file mode 100644 index c3e4a2326d0..00000000000 --- a/mysql-test/r/3.23/rpl000006.result +++ /dev/null @@ -1,2 +0,0 @@ -unix_timestamp(t) -200006 diff --git a/mysql-test/r/3.23/rpl000007.result b/mysql-test/r/3.23/rpl000007.result deleted file mode 100644 index 08f13272f2a..00000000000 --- a/mysql-test/r/3.23/rpl000007.result +++ /dev/null @@ -1,2 +0,0 @@ -n m -4 15 diff --git a/mysql-test/r/3.23/rpl000008.result b/mysql-test/r/3.23/rpl000008.result deleted file mode 100644 index 964ea8d84de..00000000000 --- a/mysql-test/r/3.23/rpl000008.result +++ /dev/null @@ -1,2 +0,0 @@ -n m k -4 15 55 diff --git a/mysql-test/r/3.23/rpl000009.result b/mysql-test/r/3.23/rpl000009.result deleted file mode 100644 index 08f13272f2a..00000000000 --- a/mysql-test/r/3.23/rpl000009.result +++ /dev/null @@ -1,2 +0,0 @@ -n m -4 15 diff --git a/mysql-test/r/3.23/rpl000010.result b/mysql-test/r/3.23/rpl000010.result deleted file mode 100644 index 982e0523cfb..00000000000 --- a/mysql-test/r/3.23/rpl000010.result +++ /dev/null @@ -1,3 +0,0 @@ -n -1 -2 diff --git a/mysql-test/r/3.23/rpl000011.result b/mysql-test/r/3.23/rpl000011.result deleted file mode 100644 index 982e0523cfb..00000000000 --- a/mysql-test/r/3.23/rpl000011.result +++ /dev/null @@ -1,3 +0,0 @@ -n -1 -2 diff --git a/mysql-test/r/3.23/rpl000012.result b/mysql-test/r/3.23/rpl000012.result deleted file mode 100644 index 22fd6be3003..00000000000 --- a/mysql-test/r/3.23/rpl000012.result +++ /dev/null @@ -1,7 +0,0 @@ -n -1 -2 -3 -4 -5 -6 diff --git a/mysql-test/r/3.23/rpl000012.status.result b/mysql-test/r/3.23/rpl000012.status.result deleted file mode 100644 index fbbae06c3f9..00000000000 --- a/mysql-test/r/3.23/rpl000012.status.result +++ /dev/null @@ -1,2 +0,0 @@ -Variable_name Value -Slave_open_temp_tables 0 diff --git a/mysql-test/r/3.23/rpl000013.result b/mysql-test/r/3.23/rpl000013.result deleted file mode 100644 index 22fd6be3003..00000000000 --- a/mysql-test/r/3.23/rpl000013.result +++ /dev/null @@ -1,7 +0,0 @@ -n -1 -2 -3 -4 -5 -6 diff --git a/mysql-test/r/3.23/rpl000013.status.result b/mysql-test/r/3.23/rpl000013.status.result deleted file mode 100644 index fbbae06c3f9..00000000000 --- a/mysql-test/r/3.23/rpl000013.status.result +++ /dev/null @@ -1,2 +0,0 @@ -Variable_name Value -Slave_open_temp_tables 0 diff --git a/mysql-test/r/3.23/sel000001.result b/mysql-test/r/3.23/sel000001.result deleted file mode 100644 index 749778fabac..00000000000 --- a/mysql-test/r/3.23/sel000001.result +++ /dev/null @@ -1,2 +0,0 @@ -s id -mouse 3 diff --git a/mysql-test/r/3.23/sel000002.result b/mysql-test/r/3.23/sel000002.result deleted file mode 100644 index c62967af0bb..00000000000 --- a/mysql-test/r/3.23/sel000002.result +++ /dev/null @@ -1,4 +0,0 @@ -n -1 -2 -3 diff --git a/mysql-test/r/3.23/sel000003.result b/mysql-test/r/3.23/sel000003.result deleted file mode 100644 index 098e2cce1b0..00000000000 --- a/mysql-test/r/3.23/sel000003.result +++ /dev/null @@ -1,3 +0,0 @@ -n score -4 10 -2 20 diff --git a/mysql-test/r/3.23/sel000004.result b/mysql-test/r/3.23/sel000004.result deleted file mode 100644 index 26f5563f3df..00000000000 --- a/mysql-test/r/3.23/sel000004.result +++ /dev/null @@ -1,4 +0,0 @@ -id elt(two.val,'one','two') -1 one -2 one -4 two diff --git a/mysql-test/r/3.23/sel000005.result b/mysql-test/r/3.23/sel000005.result deleted file mode 100644 index 26f5563f3df..00000000000 --- a/mysql-test/r/3.23/sel000005.result +++ /dev/null @@ -1,4 +0,0 @@ -id elt(two.val,'one','two') -1 one -2 one -4 two diff --git a/mysql-test/r/3.23/sel000006.result b/mysql-test/r/3.23/sel000006.result deleted file mode 100644 index 82967786fce..00000000000 --- a/mysql-test/r/3.23/sel000006.result +++ /dev/null @@ -1,2 +0,0 @@ -ROUND(5.64,1) ROUND(5.64,2) ROUND(5.64,-1) ROUND(5.64,-2) -5.6 5.64 10 0 diff --git a/mysql-test/r/3.23/sel000007.result b/mysql-test/r/3.23/sel000007.result deleted file mode 100644 index 2a175b2d723..00000000000 --- a/mysql-test/r/3.23/sel000007.result +++ /dev/null @@ -1,2 +0,0 @@ -TRUNCATE(52.64,1) TRUNCATE(52.64,2) TRUNCATE(52.64,-1) TRUNCATE(52.64,-2) -52.6 52.64 50 0 diff --git a/mysql-test/r/3.23/sel000008.result b/mysql-test/r/3.23/sel000008.result deleted file mode 100644 index 3438a3e6970..00000000000 --- a/mysql-test/r/3.23/sel000008.result +++ /dev/null @@ -1,2 +0,0 @@ -ABS(-10) LOG(EXP(10)) EXP(LOG(SQRT(10))*2) POW(10,LOG10(10)) RAND(999999) RAND() POWER(2,4) -10 10.000000 10.000000 10.000000 0.18435012473199 0.76373626176616 16.000000 diff --git a/mysql-test/r/3.23/sel000009.result b/mysql-test/r/3.23/sel000009.result deleted file mode 100644 index 410b404774f..00000000000 --- a/mysql-test/r/3.23/sel000009.result +++ /dev/null @@ -1,2 +0,0 @@ -PI() SIN(PI()/2) COS(PI()/2) TAN(PI()) COT(1) ASIN(1) ACOS(0) ATAN(1) -3.141593 1.000000 0.000000 -0.000000 0.64209262 1.570796 1.570796 0.785398 diff --git a/mysql-test/r/3.23/sel000010.result b/mysql-test/r/3.23/sel000010.result deleted file mode 100644 index 439e30093aa..00000000000 --- a/mysql-test/r/3.23/sel000010.result +++ /dev/null @@ -1,2 +0,0 @@ -1 | (1+1) 5 & 3 BIT_COUNT(7) -3 1 3 diff --git a/mysql-test/r/3.23/sel000011.result b/mysql-test/r/3.23/sel000011.result deleted file mode 100644 index a0e5f33bc6b..00000000000 --- a/mysql-test/r/3.23/sel000011.result +++ /dev/null @@ -1,2 +0,0 @@ -1 << 32 1 << 63 1 << 64 4 >> 2 4 >> 63 1<< 63 >> 60 -4294967296 -9223372036854775808 0 1 0 8 diff --git a/mysql-test/r/3.23/sel000012.result b/mysql-test/r/3.23/sel000012.result deleted file mode 100644 index 579fe8d87a3..00000000000 --- a/mysql-test/r/3.23/sel000012.result +++ /dev/null @@ -1,2 +0,0 @@ -10 10.0 10. .1e+2 100.0e-1 -10 10.0 10 10 10 diff --git a/mysql-test/r/3.23/sel000013.result b/mysql-test/r/3.23/sel000013.result deleted file mode 100644 index eda7608ef4d..00000000000 --- a/mysql-test/r/3.23/sel000013.result +++ /dev/null @@ -1,2 +0,0 @@ -6e-05 -6e-05 --6e-05 -6e-05+1.000000 -6e-05 -6e-05 6e-05 0.99994 diff --git a/mysql-test/r/3.23/sel000014.result b/mysql-test/r/3.23/sel000014.result deleted file mode 100644 index c9c359068ca..00000000000 --- a/mysql-test/r/3.23/sel000014.result +++ /dev/null @@ -1,2 +0,0 @@ -0 256 00000000000000065536 2147483647 -2147483648 2147483648 +4294967296 -0 256 65536 2147483647 -2147483648 2147483648 0 diff --git a/mysql-test/r/3.23/sel000015.result b/mysql-test/r/3.23/sel000015.result deleted file mode 100644 index e4fca79f398..00000000000 --- a/mysql-test/r/3.23/sel000015.result +++ /dev/null @@ -1,2 +0,0 @@ -922337203685477580 92233720368547758000 -922337203685477580 92233720368547758080 diff --git a/mysql-test/r/3.23/sel000016.result b/mysql-test/r/3.23/sel000016.result deleted file mode 100644 index 58384e104cc..00000000000 --- a/mysql-test/r/3.23/sel000016.result +++ /dev/null @@ -1,2 +0,0 @@ --922337203685477580 -92233720368547758000 --922337203685477580 -92233720368547758080 diff --git a/mysql-test/r/3.23/sel000017.result b/mysql-test/r/3.23/sel000017.result deleted file mode 100644 index d68bb440274..00000000000 --- a/mysql-test/r/3.23/sel000017.result +++ /dev/null @@ -1,2 +0,0 @@ -9223372036854775807 -009223372036854775808 -9223372036854775807 -9223372036854775808 diff --git a/mysql-test/r/3.23/sel000018.result b/mysql-test/r/3.23/sel000018.result deleted file mode 100644 index 1155ffd553e..00000000000 --- a/mysql-test/r/3.23/sel000018.result +++ /dev/null @@ -1,2 +0,0 @@ -+9999999999999999999 -9999999999999999999 -10000000000000000000 -10000000000000000000 diff --git a/mysql-test/r/3.23/sel000019.result b/mysql-test/r/3.23/sel000019.result deleted file mode 100644 index 56e8bfebdcd..00000000000 --- a/mysql-test/r/3.23/sel000019.result +++ /dev/null @@ -1,2 +0,0 @@ -DEGREES(PI()) RADIANS(360) -180 6.2831853071796 diff --git a/mysql-test/r/3.23/sel000020.result b/mysql-test/r/3.23/sel000020.result deleted file mode 100644 index 3d3b68fca73..00000000000 --- a/mysql-test/r/3.23/sel000020.result +++ /dev/null @@ -1,2 +0,0 @@ -0=0 1>0 1>=1 1<0 1<=0 1!=0 STRCMP("abc","abcd") STRCMP("b","a") STRCMP("a","a") -1 1 1 0 0 1 -1 1 0 diff --git a/mysql-test/r/3.23/sel000021.result b/mysql-test/r/3.23/sel000021.result deleted file mode 100644 index 03ab284ac5d..00000000000 --- a/mysql-test/r/3.23/sel000021.result +++ /dev/null @@ -1,2 +0,0 @@ -"a"<"b" "a"<="b" "b">="a" "b">"a" "a"="A" "a"<>"b" -1 1 1 1 1 1 diff --git a/mysql-test/r/3.23/sel000022.result b/mysql-test/r/3.23/sel000022.result deleted file mode 100644 index 4f6dedaa83f..00000000000 --- a/mysql-test/r/3.23/sel000022.result +++ /dev/null @@ -1,2 +0,0 @@ -"a "="A" "A "="a" "a " <= "A b" -1 1 1 diff --git a/mysql-test/r/3.23/sel000023.result b/mysql-test/r/3.23/sel000023.result deleted file mode 100644 index 835c340b686..00000000000 --- a/mysql-test/r/3.23/sel000023.result +++ /dev/null @@ -1,2 +0,0 @@ -"abc" LIKE "a%" "abc" NOT LIKE "%d%" "a%" LIKE "a\%" "abc%" LIKE "a%\%" "abcd" LIKE "a%b_%d" "a" LIKE "%%a" "abcde" LIKE "a%_e" "abc" LIKE "abc%" -1 1 1 1 1 1 1 1 diff --git a/mysql-test/r/3.23/sel000024.result b/mysql-test/r/3.23/sel000024.result deleted file mode 100644 index daa9a143b60..00000000000 --- a/mysql-test/r/3.23/sel000024.result +++ /dev/null @@ -1,2 +0,0 @@ -"a" LIKE "%%b" "a" LIKE "%%ab" "ab" LIKE "a\%" "ab" LIKE "_" "ab" LIKE "ab_" "abc" LIKE "%_d" "abc" LIKE "abc%d" -0 0 0 0 0 0 0 diff --git a/mysql-test/r/3.23/sel000025.result b/mysql-test/r/3.23/sel000025.result deleted file mode 100644 index caf244be1d9..00000000000 --- a/mysql-test/r/3.23/sel000025.result +++ /dev/null @@ -1,2 +0,0 @@ -'?' LIKE '|%' '?' LIKE '|%' ESCAPE '|' '%' LIKE '|%' '%' LIKE '|%' ESCAPE '|' '%' LIKE '%' -0 0 0 1 1 diff --git a/mysql-test/r/3.23/sel000026.result b/mysql-test/r/3.23/sel000026.result deleted file mode 100644 index acf301a349f..00000000000 --- a/mysql-test/r/3.23/sel000026.result +++ /dev/null @@ -1,2 +0,0 @@ -'abc' LIKE '%c' 'abcabc' LIKE '%c' "ab" LIKE "" "ab" LIKE "a" "ab" LIKE "ab" -1 1 0 0 1 diff --git a/mysql-test/r/3.23/sel000027.result b/mysql-test/r/3.23/sel000027.result deleted file mode 100644 index df2945c6da8..00000000000 --- a/mysql-test/r/3.23/sel000027.result +++ /dev/null @@ -1,2 +0,0 @@ -"Det här är svenska" REGEXP "h[[:alpha:]]+r" "aba" REGEXP "^(a|b)*$" -1 1 diff --git a/mysql-test/r/3.23/sel000028.result b/mysql-test/r/3.23/sel000028.result deleted file mode 100644 index cd5b3268b53..00000000000 --- a/mysql-test/r/3.23/sel000028.result +++ /dev/null @@ -1,2 +0,0 @@ -"aba" REGEXP CONCAT("^","a") -1 diff --git a/mysql-test/r/3.23/sel000029.result b/mysql-test/r/3.23/sel000029.result deleted file mode 100644 index 0ceb7494fd3..00000000000 --- a/mysql-test/r/3.23/sel000029.result +++ /dev/null @@ -1,2 +0,0 @@ -!0 NOT 0=1 !(0=0) 1 AND 1 1 && 0 0 OR 1 1 || NULL 1=1 OR 1=1 AND 1=0 -1 1 0 1 0 1 1 1 diff --git a/mysql-test/r/3.23/sel000030.result b/mysql-test/r/3.23/sel000030.result deleted file mode 100644 index 575549b600f..00000000000 --- a/mysql-test/r/3.23/sel000030.result +++ /dev/null @@ -1,2 +0,0 @@ -IF(0,"ERROR","this") IF(1,"is","ERROR") IF(NULL,"ERROR","a") IF(1,2,3)|0 IF(1,2.0,3.0)+0 -this is a 2 2.0 diff --git a/mysql-test/r/3.23/sel000100.result b/mysql-test/r/3.23/sel000100.result deleted file mode 100644 index 6c204279c28..00000000000 --- a/mysql-test/r/3.23/sel000100.result +++ /dev/null @@ -1,2 +0,0 @@ -key_link_id link -NULL NULL diff --git a/mysql-test/r/3.23/shw000001.result b/mysql-test/r/3.23/shw000001.result deleted file mode 100644 index f38d2f1ef36..00000000000 --- a/mysql-test/r/3.23/shw000001.result +++ /dev/null @@ -1,5 +0,0 @@ -Table Create Table -test CREATE TABLE `test` ( - `test_set` set('val1','val2','val3') NOT NULL default '', - `name` char(20) default 'O''Brien' -) TYPE=MyISAM COMMENT='it''s a table' diff --git a/mysql-test/r/alt000001.result b/mysql-test/r/alt000001.result new file mode 100644 index 00000000000..cc95b808d23 --- /dev/null +++ b/mysql-test/r/alt000001.result @@ -0,0 +1,5 @@ +n +3 +9 +10 +12 diff --git a/mysql-test/r/ins000001.result b/mysql-test/r/ins000001.result new file mode 100644 index 00000000000..1003b3b6b18 --- /dev/null +++ b/mysql-test/r/ins000001.result @@ -0,0 +1,4 @@ +id domain +1 mysql.com +2 hotmail.com +3 aol.com diff --git a/mysql-test/r/rpl000001.a.result b/mysql-test/r/rpl000001.a.result new file mode 100644 index 00000000000..982e0523cfb --- /dev/null +++ b/mysql-test/r/rpl000001.a.result @@ -0,0 +1,3 @@ +n +1 +2 diff --git a/mysql-test/r/rpl000001.b.result b/mysql-test/r/rpl000001.b.result new file mode 100644 index 00000000000..17cdaf46fa6 --- /dev/null +++ b/mysql-test/r/rpl000001.b.result @@ -0,0 +1,2 @@ +sum(length(word)) +71 diff --git a/mysql-test/r/rpl000002.result b/mysql-test/r/rpl000002.result new file mode 100644 index 00000000000..c76fc46ae97 --- /dev/null +++ b/mysql-test/r/rpl000002.result @@ -0,0 +1,4 @@ +n +2000 +2001 +2002 diff --git a/mysql-test/r/rpl000003.result b/mysql-test/r/rpl000003.result new file mode 100644 index 00000000000..c62967af0bb --- /dev/null +++ b/mysql-test/r/rpl000003.result @@ -0,0 +1,4 @@ +n +1 +2 +3 diff --git a/mysql-test/r/rpl000004.a.result b/mysql-test/r/rpl000004.a.result new file mode 100644 index 00000000000..4061fdb4a0d --- /dev/null +++ b/mysql-test/r/rpl000004.a.result @@ -0,0 +1,2 @@ +Table Op Msg_type Msg_text +test.words check status OK diff --git a/mysql-test/r/rpl000004.b.result b/mysql-test/r/rpl000004.b.result new file mode 100644 index 00000000000..c71e0b46471 --- /dev/null +++ b/mysql-test/r/rpl000004.b.result @@ -0,0 +1,2 @@ +count(*) +10 diff --git a/mysql-test/r/rpl000005.result b/mysql-test/r/rpl000005.result new file mode 100644 index 00000000000..763154b938e --- /dev/null +++ b/mysql-test/r/rpl000005.result @@ -0,0 +1,4 @@ +name age id +Andy 31 00000001 +Jacob 2 00000002 +Caleb 1 00000003 diff --git a/mysql-test/r/rpl000006.result b/mysql-test/r/rpl000006.result new file mode 100644 index 00000000000..c3e4a2326d0 --- /dev/null +++ b/mysql-test/r/rpl000006.result @@ -0,0 +1,2 @@ +unix_timestamp(t) +200006 diff --git a/mysql-test/r/rpl000007.result b/mysql-test/r/rpl000007.result new file mode 100644 index 00000000000..08f13272f2a --- /dev/null +++ b/mysql-test/r/rpl000007.result @@ -0,0 +1,2 @@ +n m +4 15 diff --git a/mysql-test/r/rpl000008.result b/mysql-test/r/rpl000008.result new file mode 100644 index 00000000000..964ea8d84de --- /dev/null +++ b/mysql-test/r/rpl000008.result @@ -0,0 +1,2 @@ +n m k +4 15 55 diff --git a/mysql-test/r/rpl000009.result b/mysql-test/r/rpl000009.result new file mode 100644 index 00000000000..08f13272f2a --- /dev/null +++ b/mysql-test/r/rpl000009.result @@ -0,0 +1,2 @@ +n m +4 15 diff --git a/mysql-test/r/rpl000010.result b/mysql-test/r/rpl000010.result new file mode 100644 index 00000000000..982e0523cfb --- /dev/null +++ b/mysql-test/r/rpl000010.result @@ -0,0 +1,3 @@ +n +1 +2 diff --git a/mysql-test/r/rpl000011.result b/mysql-test/r/rpl000011.result new file mode 100644 index 00000000000..982e0523cfb --- /dev/null +++ b/mysql-test/r/rpl000011.result @@ -0,0 +1,3 @@ +n +1 +2 diff --git a/mysql-test/r/rpl000012.result b/mysql-test/r/rpl000012.result new file mode 100644 index 00000000000..22fd6be3003 --- /dev/null +++ b/mysql-test/r/rpl000012.result @@ -0,0 +1,7 @@ +n +1 +2 +3 +4 +5 +6 diff --git a/mysql-test/r/rpl000012.status.result b/mysql-test/r/rpl000012.status.result new file mode 100644 index 00000000000..fbbae06c3f9 --- /dev/null +++ b/mysql-test/r/rpl000012.status.result @@ -0,0 +1,2 @@ +Variable_name Value +Slave_open_temp_tables 0 diff --git a/mysql-test/r/rpl000013.result b/mysql-test/r/rpl000013.result new file mode 100644 index 00000000000..22fd6be3003 --- /dev/null +++ b/mysql-test/r/rpl000013.result @@ -0,0 +1,7 @@ +n +1 +2 +3 +4 +5 +6 diff --git a/mysql-test/r/rpl000013.status.result b/mysql-test/r/rpl000013.status.result new file mode 100644 index 00000000000..fbbae06c3f9 --- /dev/null +++ b/mysql-test/r/rpl000013.status.result @@ -0,0 +1,2 @@ +Variable_name Value +Slave_open_temp_tables 0 diff --git a/mysql-test/r/sel000001.result b/mysql-test/r/sel000001.result new file mode 100644 index 00000000000..749778fabac --- /dev/null +++ b/mysql-test/r/sel000001.result @@ -0,0 +1,2 @@ +s id +mouse 3 diff --git a/mysql-test/r/sel000002.result b/mysql-test/r/sel000002.result new file mode 100644 index 00000000000..c62967af0bb --- /dev/null +++ b/mysql-test/r/sel000002.result @@ -0,0 +1,4 @@ +n +1 +2 +3 diff --git a/mysql-test/r/sel000003.result b/mysql-test/r/sel000003.result new file mode 100644 index 00000000000..098e2cce1b0 --- /dev/null +++ b/mysql-test/r/sel000003.result @@ -0,0 +1,3 @@ +n score +4 10 +2 20 diff --git a/mysql-test/r/sel000004.result b/mysql-test/r/sel000004.result new file mode 100644 index 00000000000..26f5563f3df --- /dev/null +++ b/mysql-test/r/sel000004.result @@ -0,0 +1,4 @@ +id elt(two.val,'one','two') +1 one +2 one +4 two diff --git a/mysql-test/r/sel000005.result b/mysql-test/r/sel000005.result new file mode 100644 index 00000000000..26f5563f3df --- /dev/null +++ b/mysql-test/r/sel000005.result @@ -0,0 +1,4 @@ +id elt(two.val,'one','two') +1 one +2 one +4 two diff --git a/mysql-test/r/sel000006.result b/mysql-test/r/sel000006.result new file mode 100644 index 00000000000..82967786fce --- /dev/null +++ b/mysql-test/r/sel000006.result @@ -0,0 +1,2 @@ +ROUND(5.64,1) ROUND(5.64,2) ROUND(5.64,-1) ROUND(5.64,-2) +5.6 5.64 10 0 diff --git a/mysql-test/r/sel000007.result b/mysql-test/r/sel000007.result new file mode 100644 index 00000000000..2a175b2d723 --- /dev/null +++ b/mysql-test/r/sel000007.result @@ -0,0 +1,2 @@ +TRUNCATE(52.64,1) TRUNCATE(52.64,2) TRUNCATE(52.64,-1) TRUNCATE(52.64,-2) +52.6 52.64 50 0 diff --git a/mysql-test/r/sel000008.result b/mysql-test/r/sel000008.result new file mode 100644 index 00000000000..3438a3e6970 --- /dev/null +++ b/mysql-test/r/sel000008.result @@ -0,0 +1,2 @@ +ABS(-10) LOG(EXP(10)) EXP(LOG(SQRT(10))*2) POW(10,LOG10(10)) RAND(999999) RAND() POWER(2,4) +10 10.000000 10.000000 10.000000 0.18435012473199 0.76373626176616 16.000000 diff --git a/mysql-test/r/sel000009.result b/mysql-test/r/sel000009.result new file mode 100644 index 00000000000..410b404774f --- /dev/null +++ b/mysql-test/r/sel000009.result @@ -0,0 +1,2 @@ +PI() SIN(PI()/2) COS(PI()/2) TAN(PI()) COT(1) ASIN(1) ACOS(0) ATAN(1) +3.141593 1.000000 0.000000 -0.000000 0.64209262 1.570796 1.570796 0.785398 diff --git a/mysql-test/r/sel000010.result b/mysql-test/r/sel000010.result new file mode 100644 index 00000000000..439e30093aa --- /dev/null +++ b/mysql-test/r/sel000010.result @@ -0,0 +1,2 @@ +1 | (1+1) 5 & 3 BIT_COUNT(7) +3 1 3 diff --git a/mysql-test/r/sel000011.result b/mysql-test/r/sel000011.result new file mode 100644 index 00000000000..a0e5f33bc6b --- /dev/null +++ b/mysql-test/r/sel000011.result @@ -0,0 +1,2 @@ +1 << 32 1 << 63 1 << 64 4 >> 2 4 >> 63 1<< 63 >> 60 +4294967296 -9223372036854775808 0 1 0 8 diff --git a/mysql-test/r/sel000012.result b/mysql-test/r/sel000012.result new file mode 100644 index 00000000000..579fe8d87a3 --- /dev/null +++ b/mysql-test/r/sel000012.result @@ -0,0 +1,2 @@ +10 10.0 10. .1e+2 100.0e-1 +10 10.0 10 10 10 diff --git a/mysql-test/r/sel000013.result b/mysql-test/r/sel000013.result new file mode 100644 index 00000000000..eda7608ef4d --- /dev/null +++ b/mysql-test/r/sel000013.result @@ -0,0 +1,2 @@ +6e-05 -6e-05 --6e-05 -6e-05+1.000000 +6e-05 -6e-05 6e-05 0.99994 diff --git a/mysql-test/r/sel000014.result b/mysql-test/r/sel000014.result new file mode 100644 index 00000000000..c9c359068ca --- /dev/null +++ b/mysql-test/r/sel000014.result @@ -0,0 +1,2 @@ +0 256 00000000000000065536 2147483647 -2147483648 2147483648 +4294967296 +0 256 65536 2147483647 -2147483648 2147483648 0 diff --git a/mysql-test/r/sel000015.result b/mysql-test/r/sel000015.result new file mode 100644 index 00000000000..e4fca79f398 --- /dev/null +++ b/mysql-test/r/sel000015.result @@ -0,0 +1,2 @@ +922337203685477580 92233720368547758000 +922337203685477580 92233720368547758080 diff --git a/mysql-test/r/sel000016.result b/mysql-test/r/sel000016.result new file mode 100644 index 00000000000..58384e104cc --- /dev/null +++ b/mysql-test/r/sel000016.result @@ -0,0 +1,2 @@ +-922337203685477580 -92233720368547758000 +-922337203685477580 -92233720368547758080 diff --git a/mysql-test/r/sel000017.result b/mysql-test/r/sel000017.result new file mode 100644 index 00000000000..d68bb440274 --- /dev/null +++ b/mysql-test/r/sel000017.result @@ -0,0 +1,2 @@ +9223372036854775807 -009223372036854775808 +9223372036854775807 -9223372036854775808 diff --git a/mysql-test/r/sel000018.result b/mysql-test/r/sel000018.result new file mode 100644 index 00000000000..1155ffd553e --- /dev/null +++ b/mysql-test/r/sel000018.result @@ -0,0 +1,2 @@ ++9999999999999999999 -9999999999999999999 +10000000000000000000 -10000000000000000000 diff --git a/mysql-test/r/sel000019.result b/mysql-test/r/sel000019.result new file mode 100644 index 00000000000..56e8bfebdcd --- /dev/null +++ b/mysql-test/r/sel000019.result @@ -0,0 +1,2 @@ +DEGREES(PI()) RADIANS(360) +180 6.2831853071796 diff --git a/mysql-test/r/sel000020.result b/mysql-test/r/sel000020.result new file mode 100644 index 00000000000..3d3b68fca73 --- /dev/null +++ b/mysql-test/r/sel000020.result @@ -0,0 +1,2 @@ +0=0 1>0 1>=1 1<0 1<=0 1!=0 STRCMP("abc","abcd") STRCMP("b","a") STRCMP("a","a") +1 1 1 0 0 1 -1 1 0 diff --git a/mysql-test/r/sel000021.result b/mysql-test/r/sel000021.result new file mode 100644 index 00000000000..03ab284ac5d --- /dev/null +++ b/mysql-test/r/sel000021.result @@ -0,0 +1,2 @@ +"a"<"b" "a"<="b" "b">="a" "b">"a" "a"="A" "a"<>"b" +1 1 1 1 1 1 diff --git a/mysql-test/r/sel000022.result b/mysql-test/r/sel000022.result new file mode 100644 index 00000000000..4f6dedaa83f --- /dev/null +++ b/mysql-test/r/sel000022.result @@ -0,0 +1,2 @@ +"a "="A" "A "="a" "a " <= "A b" +1 1 1 diff --git a/mysql-test/r/sel000023.result b/mysql-test/r/sel000023.result new file mode 100644 index 00000000000..835c340b686 --- /dev/null +++ b/mysql-test/r/sel000023.result @@ -0,0 +1,2 @@ +"abc" LIKE "a%" "abc" NOT LIKE "%d%" "a%" LIKE "a\%" "abc%" LIKE "a%\%" "abcd" LIKE "a%b_%d" "a" LIKE "%%a" "abcde" LIKE "a%_e" "abc" LIKE "abc%" +1 1 1 1 1 1 1 1 diff --git a/mysql-test/r/sel000024.result b/mysql-test/r/sel000024.result new file mode 100644 index 00000000000..daa9a143b60 --- /dev/null +++ b/mysql-test/r/sel000024.result @@ -0,0 +1,2 @@ +"a" LIKE "%%b" "a" LIKE "%%ab" "ab" LIKE "a\%" "ab" LIKE "_" "ab" LIKE "ab_" "abc" LIKE "%_d" "abc" LIKE "abc%d" +0 0 0 0 0 0 0 diff --git a/mysql-test/r/sel000025.result b/mysql-test/r/sel000025.result new file mode 100644 index 00000000000..caf244be1d9 --- /dev/null +++ b/mysql-test/r/sel000025.result @@ -0,0 +1,2 @@ +'?' LIKE '|%' '?' LIKE '|%' ESCAPE '|' '%' LIKE '|%' '%' LIKE '|%' ESCAPE '|' '%' LIKE '%' +0 0 0 1 1 diff --git a/mysql-test/r/sel000026.result b/mysql-test/r/sel000026.result new file mode 100644 index 00000000000..acf301a349f --- /dev/null +++ b/mysql-test/r/sel000026.result @@ -0,0 +1,2 @@ +'abc' LIKE '%c' 'abcabc' LIKE '%c' "ab" LIKE "" "ab" LIKE "a" "ab" LIKE "ab" +1 1 0 0 1 diff --git a/mysql-test/r/sel000027.result b/mysql-test/r/sel000027.result new file mode 100644 index 00000000000..df2945c6da8 --- /dev/null +++ b/mysql-test/r/sel000027.result @@ -0,0 +1,2 @@ +"Det här är svenska" REGEXP "h[[:alpha:]]+r" "aba" REGEXP "^(a|b)*$" +1 1 diff --git a/mysql-test/r/sel000028.result b/mysql-test/r/sel000028.result new file mode 100644 index 00000000000..cd5b3268b53 --- /dev/null +++ b/mysql-test/r/sel000028.result @@ -0,0 +1,2 @@ +"aba" REGEXP CONCAT("^","a") +1 diff --git a/mysql-test/r/sel000029.result b/mysql-test/r/sel000029.result new file mode 100644 index 00000000000..0ceb7494fd3 --- /dev/null +++ b/mysql-test/r/sel000029.result @@ -0,0 +1,2 @@ +!0 NOT 0=1 !(0=0) 1 AND 1 1 && 0 0 OR 1 1 || NULL 1=1 OR 1=1 AND 1=0 +1 1 0 1 0 1 1 1 diff --git a/mysql-test/r/sel000030.result b/mysql-test/r/sel000030.result new file mode 100644 index 00000000000..575549b600f --- /dev/null +++ b/mysql-test/r/sel000030.result @@ -0,0 +1,2 @@ +IF(0,"ERROR","this") IF(1,"is","ERROR") IF(NULL,"ERROR","a") IF(1,2,3)|0 IF(1,2.0,3.0)+0 +this is a 2 2.0 diff --git a/mysql-test/r/sel000100.result b/mysql-test/r/sel000100.result new file mode 100644 index 00000000000..6c204279c28 --- /dev/null +++ b/mysql-test/r/sel000100.result @@ -0,0 +1,2 @@ +key_link_id link +NULL NULL diff --git a/mysql-test/r/shw000001.result b/mysql-test/r/shw000001.result new file mode 100644 index 00000000000..f38d2f1ef36 --- /dev/null +++ b/mysql-test/r/shw000001.result @@ -0,0 +1,5 @@ +Table Create Table +test CREATE TABLE `test` ( + `test_set` set('val1','val2','val3') NOT NULL default '', + `name` char(20) default 'O''Brien' +) TYPE=MyISAM COMMENT='it''s a table' diff --git a/mysql-test/std_data/words b/mysql-test/std_data/words deleted file mode 100644 index c2d1cb70cbf..00000000000 --- a/mysql-test/std_data/words +++ /dev/null @@ -1,10 +0,0 @@ -Aarhus -Aaron -Ababa -aback -abaft -abandon -abandoned -abandoning -abandonment -abandons diff --git a/mysql-test/std_data/words.dat b/mysql-test/std_data/words.dat new file mode 100644 index 00000000000..c2d1cb70cbf --- /dev/null +++ b/mysql-test/std_data/words.dat @@ -0,0 +1,10 @@ +Aarhus +Aaron +Ababa +aback +abaft +abandon +abandoned +abandoning +abandonment +abandons 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