Skip to content

M
MariaDB
Commit bc3b4a2c authored by mleich@five.local.lan's avatar mleich@five.local.lan
Browse files
Options

Merge five.local.lan:/work/merge/mysql-5.1-Bug 

into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
parents e39ceb99 414299f4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 7816 additions and 9977 deletions
mysql-test/Makefile.am
View file @ bc3b4a2c
...@@ -46,6 +46,7 @@ dist-hook: ...@@ -46,6 +46,7 @@ dist-hook:
$(distdir)/std_data/ndb_backup51_data_le \ $(distdir)/std_data/ndb_backup51_data_le \
$(distdir)/std_data/parts \ $(distdir)/std_data/parts \
$(distdir)/lib \ $(distdir)/lib \
$(distdir)/funcs_1 \
$(distdir)/lib/My $(distdir)/lib/My
-$(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t -$(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t
$(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t $(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t
...@@ -75,6 +76,7 @@ dist-hook: ...@@ -75,6 +76,7 @@ dist-hook:
$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_be/BACKUP* $(distdir)/std_data/ndb_backup51_data_be $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_be/BACKUP* $(distdir)/std_data/ndb_backup51_data_be
$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(distdir)/std_data/ndb_backup51_data_le $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(distdir)/std_data/ndb_backup51_data_le
$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(distdir)/std_data/parts $(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(distdir)/std_data/parts
$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(distdir)/std_data/funcs_1
$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib $(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(distdir)/lib/My $(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(distdir)/lib/My
-rm -rf `find $(distdir)/suite -type d -name SCCS` $(distdir)/suite/row_lock -rm -rf `find $(distdir)/suite -type d -name SCCS` $(distdir)/suite/row_lock
...@@ -93,6 +95,7 @@ install-data-local: ...@@ -93,6 +95,7 @@ install-data-local:
$(DESTDIR)$(testdir)/std_data/ndb_backup51_data_le \ $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_le \
$(DESTDIR)$(testdir)/std_data/parts \ $(DESTDIR)$(testdir)/std_data/parts \
$(DESTDIR)$(testdir)/lib \ $(DESTDIR)$(testdir)/lib \
$(DESTDIR)$(testdir)/funcs_1 \
$(DESTDIR)$(testdir)/lib/My $(DESTDIR)$(testdir)/lib/My
$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir) $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
-$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t -$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t
...@@ -127,6 +130,7 @@ install-data-local: ...@@ -127,6 +130,7 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_be/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_be $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_be/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_be
$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_le $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_le
$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(DESTDIR)$(testdir)/std_data/parts $(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(DESTDIR)$(testdir)/std_data/parts
$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(distdir)/std_data/funcs_1
$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib $(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib
$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(DESTDIR)$(testdir)/lib/My $(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(DESTDIR)$(testdir)/lib/My
for f in `(cd $(srcdir); find suite -type f | egrep -v 'SCCS|row_lock')`; \ for f in `(cd $(srcdir); find suite -type f | egrep -v 'SCCS|row_lock')`; \
......
mysql-test/std_data/funcs_1/load_file.txt 0 → 100644
View file @ bc3b4a2c
Here is content from load_file
mysql-test/suite/funcs_1/README.txt
View file @ bc3b4a2c
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
SESSION_STATUS SESSION_STATUS
SESSION_VARIABLES SESSION_VARIABLES
3. Some hints: 3. Some hints for maintainers of this suite:
- SHOW TABLES ... LIKE '<pattern>' - SHOW TABLES ... LIKE '<pattern>'
does a case sensitive comparison between the tablename and does a case sensitive comparison between the tablename and
the pattern. the pattern.
...@@ -43,4 +43,12 @@ ...@@ -43,4 +43,12 @@
ERROR 42000: Access denied for user ... to database 'information_schema' ERROR 42000: Access denied for user ... to database 'information_schema'
DROP DATABASE INFORMATION_SCHEMA; DROP DATABASE INFORMATION_SCHEMA;
ERROR 42000: Access denied for user ... to database 'INFORMATION_SCHEMA' ERROR 42000: Access denied for user ... to database 'INFORMATION_SCHEMA'
- Try to unify results by
--replace_result $engine_type <engine_to_be_tested>
if we could expect that the results for storage engine variants of a
test differ only in the engine names.
This makes future maintenance easier.
- Avoid the use of include/show_msg*.inc.
They produce "SQL" noise which annoys during server debugging and can be
easy replaced by "--echo ...".
mysql-test/suite/funcs_1/include/innodb_tb1.inc
View file @ bc3b4a2c
...@@ -64,6 +64,7 @@ f57 numeric (0) not null DEFAULT 99, ...@@ -64,6 +64,7 @@ f57 numeric (0) not null DEFAULT 99,
f58 numeric (64) not null DEFAULT 99 f58 numeric (64) not null DEFAULT 99
) engine = innodb; ) engine = innodb;
--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR eval
eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb1.txt' into table tb1 ; load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/innodb_tb1.txt'
into table tb1;
mysql-test/suite/funcs_1/include/innodb_tb2.inc
View file @ bc3b4a2c
...@@ -57,5 +57,7 @@ f108 enum("1enum","2enum") not null default "1enum", ...@@ -57,5 +57,7 @@ f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = innodb; ) engine = innodb;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb2.txt' into table tb2 ; eval
load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/innodb_tb2.txt'
into table tb2;
mysql-test/suite/funcs_1/include/innodb_tb3.inc
View file @ bc3b4a2c
...@@ -64,5 +64,7 @@ f174 numeric (0), ...@@ -64,5 +64,7 @@ f174 numeric (0),
f175 numeric (64) f175 numeric (64)
) engine = innodb; ) engine = innodb;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ; eval
load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/innodb_tb3.txt'
into table tb3;
mysql-test/suite/funcs_1/include/innodb_tb4.inc
View file @ bc3b4a2c
...@@ -64,5 +64,7 @@ f240 varchar(2000) unicode, ...@@ -64,5 +64,7 @@ f240 varchar(2000) unicode,
f241 char(100) unicode f241 char(100) unicode
) engine = innodb; ) engine = innodb;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb4.txt' into table tb4 ; eval
load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/innodb_tb4.txt'
into table tb4;
mysql-test/suite/funcs_1/include/memory_tb1.inc
View file @ bc3b4a2c
...@@ -56,5 +56,7 @@ f57 numeric (0) not null DEFAULT 99, ...@@ -56,5 +56,7 @@ f57 numeric (0) not null DEFAULT 99,
f58 numeric (64) not null DEFAULT 99 f58 numeric (64) not null DEFAULT 99
) engine = memory; ) engine = memory;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb1.txt' into table tb1 ; eval
load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb1.txt'
into table tb1;
mysql-test/suite/funcs_1/include/memory_tb2.inc
View file @ bc3b4a2c
...@@ -57,5 +57,7 @@ f108 enum("1enum","2enum") not null default "1enum", ...@@ -57,5 +57,7 @@ f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = memory; ) engine = memory;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb2.txt' into table tb2 ; eval
load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb2.txt'
into table tb2 ;
mysql-test/suite/funcs_1/include/memory_tb3.inc
View file @ bc3b4a2c
...@@ -58,6 +58,7 @@ f174 numeric (0), ...@@ -58,6 +58,7 @@ f174 numeric (0),
f175 numeric (64) f175 numeric (64)
) engine = memory; ) engine = memory;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ; eval
load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb3.txt'
into table tb3;
mysql-test/suite/funcs_1/include/memory_tb4.inc
View file @ bc3b4a2c
...@@ -63,5 +63,7 @@ f239 varbinary(0), ...@@ -63,5 +63,7 @@ f239 varbinary(0),
f240 varchar(1200) unicode f240 varchar(1200) unicode
) engine = memory; ) engine = memory;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb4.txt' into table tb4 ; eval
load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb4.txt'
into table tb4;
mysql-test/suite/funcs_1/include/myisam_tb1.inc
View file @ bc3b4a2c
...@@ -64,5 +64,7 @@ f57 numeric (0) not null DEFAULT 99, ...@@ -64,5 +64,7 @@ f57 numeric (0) not null DEFAULT 99,
f58 numeric (64) not null DEFAULT 99 f58 numeric (64) not null DEFAULT 99
) engine = myisam; ) engine = myisam;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb1.txt' into table tb1 ; eval
load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/myisam_tb1.txt'
into table tb1;
mysql-test/suite/funcs_1/include/myisam_tb2.inc
View file @ bc3b4a2c
...@@ -76,5 +76,7 @@ f117 VARBINARY(192) null ...@@ -76,5 +76,7 @@ f117 VARBINARY(192) null
# f116 multilinestring null, # f116 multilinestring null,
# f117 multipolygon null # f117 multipolygon null
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb2.txt' into table tb2 ; eval
load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/myisam_tb2.txt'
into table tb2;
mysql-test/suite/funcs_1/include/myisam_tb3.inc
View file @ bc3b4a2c
...@@ -64,5 +64,7 @@ f174 numeric (0), ...@@ -64,5 +64,7 @@ f174 numeric (0),
f175 numeric (64) f175 numeric (64)
) Engine = myisam; ) Engine = myisam;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ; eval
load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/myisam_tb3.txt'
into table tb3;
mysql-test/suite/funcs_1/include/myisam_tb4.inc
View file @ bc3b4a2c
...@@ -84,5 +84,7 @@ f242 bit(30) ...@@ -84,5 +84,7 @@ f242 bit(30)
# f233 multilinestring, # f233 multilinestring,
# f234 multipolygon, # f234 multipolygon,
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb4.txt' into table tb4 ; eval
load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/myisam_tb4.txt'
into table tb4;
mysql-test/suite/funcs_1/include/ndb_tb1.inc
View file @ bc3b4a2c
...@@ -64,6 +64,7 @@ f57 numeric (0) not null DEFAULT 99, ...@@ -64,6 +64,7 @@ f57 numeric (0) not null DEFAULT 99,
f58 numeric (64) not null DEFAULT 99 f58 numeric (64) not null DEFAULT 99
) engine = ndb; ) engine = ndb;
--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR eval
eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb1.txt' into table tb1 ; load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/ndb_tb1.txt'
into table tb1 ;
mysql-test/suite/funcs_1/include/ndb_tb2.inc
View file @ bc3b4a2c
...@@ -57,5 +57,7 @@ f108 enum("1enum","2enum") not null default "1enum", ...@@ -57,5 +57,7 @@ f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = ndb; ) engine = ndb;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb2.txt' into table tb2 ; eval
load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/ndb_tb2.txt'
into table tb2 ;
mysql-test/suite/funcs_1/include/ndb_tb3.inc
View file @ bc3b4a2c
...@@ -64,5 +64,7 @@ f174 numeric (0), ...@@ -64,5 +64,7 @@ f174 numeric (0),
f175 numeric (64) f175 numeric (64)
) engine = ndb; ) engine = ndb;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ; eval
load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/ndb_tb3.txt'
into table tb3;
mysql-test/suite/funcs_1/include/ndb_tb4.inc
View file @ bc3b4a2c
...@@ -64,5 +64,7 @@ f240 varchar(2000) unicode, ...@@ -64,5 +64,7 @@ f240 varchar(2000) unicode,
f241 char(100) unicode f241 char(100) unicode
) engine = ndb; ) engine = ndb;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb4.txt' into table tb4 ; eval
load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/ndb_tb4.txt'
into table tb4 ;
mysql-test/suite/funcs_1/include/sp_tb.inc
View file @ bc3b4a2c
...@@ -5,29 +5,46 @@ USE test; ...@@ -5,29 +5,46 @@ USE test;
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS t1, t2, t4, t10, t11; DROP TABLE IF EXISTS t1, t2, t4, t10, t11;
--enable_warnings --enable_warnings
eval CREATE TABLE t1 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type; eval
eval CREATE TABLE t2 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type; CREATE TABLE t1 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
eval CREATE TABLE t4 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type; ENGINE = $engine_type;
eval CREATE TABLE t10 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type; eval
eval CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type; CREATE TABLE t2 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ENGINE = $engine_type;
eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1; eval
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR CREATE TABLE t4 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2; ENGINE = $engine_type;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR eval
eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4; CREATE TABLE t10 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ENGINE = $engine_type;
eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10; eval
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11; ENGINE = $engine_type;
--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval
LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t4.txt' INTO TABLE t1;
--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval
LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t4.txt' INTO TABLE t2;
--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval
LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t4.txt' INTO TABLE t4;
--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval
LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t4.txt' INTO TABLE t10;
--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval
LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t4.txt' INTO TABLE t11;
--disable_warnings --disable_warnings
drop TABLE if exists t3; drop TABLE if exists t3;
--enable_warnings --enable_warnings
eval CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = $engine_type; eval
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = $engine_type;
eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3; --replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval
LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t3.txt' INTO TABLE t3;
#--------------------------- #---------------------------
...@@ -37,9 +54,12 @@ drop database if exists test4; ...@@ -37,9 +54,12 @@ drop database if exists test4;
CREATE database test4; CREATE database test4;
use test4; use test4;
eval CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type; eval
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6; ENGINE = $engine_type;
--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval
LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t4.txt' INTO TABLE t6;
#--------------------------- #---------------------------
use test; use test;
...@@ -47,18 +67,23 @@ use test; ...@@ -47,18 +67,23 @@ use test;
--disable_warnings --disable_warnings
drop TABLE if exists t7, t8; drop TABLE if exists t7, t8;
--enable_warnings --enable_warnings
eval CREATE TABLE t7 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = $engine_type; eval
eval CREATE TABLE t8 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = $engine_type; CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = $engine_type;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR eval
eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7; CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = $engine_type;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8; eval
LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t7.txt' INTO TABLE t7;
--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval
LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t7.txt' INTO TABLE t8;
--disable_warnings --disable_warnings
drop TABLE if exists t9; drop TABLE if exists t9;
--enable_warnings --enable_warnings
eval CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = $engine_type; eval CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = $engine_type;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9; eval
LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
View file @ bc3b4a2c
...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1; ...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
CREATE DATABASE db_storedproc; CREATE DATABASE db_storedproc;
CREATE DATABASE db_storedproc_1; CREATE DATABASE db_storedproc_1;
USE db_storedproc; USE db_storedproc;
create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1; engine = <engine_to_be_tested>;
create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2; create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
create table t3(f1 char(20),f2 char(20),f3 integer) engine = innodb; engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
USE db_storedproc_1; USE db_storedproc_1;
create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
USE db_storedproc; USE db_storedproc;
create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb; create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb; create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t9(f1 int, f2 char(25), f3 int) engine = innodb; create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10; engine = <engine_to_be_tested>;
create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
Section 3.1.2 - Syntax checks for the stored procedure-specific Section 3.1.2 - Syntax checks for the stored procedure-specific
programming statements BEGIN/END, DECLARE, SET, SELECT/INTO, OPEN, FETCH, CLOSE: programming statements BEGIN/END, DECLARE, SET, SELECT/INTO, OPEN, FETCH, CLOSE:
...@@ -698,7 +706,7 @@ Testcase 3.1.2.54: ...@@ -698,7 +706,7 @@ Testcase 3.1.2.54:
------------------ ------------------
Ensure that a handler with a condition defined with an SQLSTATE that begins with Ensure that a handler with a condition defined with an SQLSTATE that begins with
01 is always exactly equivalent in action to a handler with an SQLWARNING “01“ is always exactly equivalent in action to a handler with an SQLWARNING
condition. condition.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
DROP PROCEDURE IF EXISTS sp0; DROP PROCEDURE IF EXISTS sp0;
...@@ -797,7 +805,7 @@ Testcase 3.1.2.56: ...@@ -797,7 +805,7 @@ Testcase 3.1.2.56:
------------------ ------------------
Ensure that a handler with a condition defined with an SQLSTATE that begins with Ensure that a handler with a condition defined with an SQLSTATE that begins with
02 is always exactly equivalent in action to a handler with a NOT FOUND “02“ is always exactly equivalent in action to a handler with a NOT FOUND
condition. condition.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
DROP PROCEDURE IF EXISTS sp0; DROP PROCEDURE IF EXISTS sp0;
...@@ -905,7 +913,7 @@ Testcase 3.1.2.58: ...@@ -905,7 +913,7 @@ Testcase 3.1.2.58:
------------------ ------------------
Ensure that a handler with a condition defined with an SQLSTATE that begins with Ensure that a handler with a condition defined with an SQLSTATE that begins with
anything other that 01 or 02 is always exactly equivalent in action to a anything other that “01“ or “02“ is always exactly equivalent in action to a
handler with an SQLEXCEPTION condition. handler with an SQLEXCEPTION condition.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
DROP PROCEDURE IF EXISTS sp0; DROP PROCEDURE IF EXISTS sp0;
...@@ -1194,16 +1202,16 @@ declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by ...@@ -1194,16 +1202,16 @@ declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by
open cur1; open cur1;
open cur2; open cur2;
BEGIN BEGIN
declare continue handler for sqlstate '02000' set count=1; declare continue handler for sqlstate '02000' set count = 1;
fetch cur1 into newf1, newf2, newf4, newf5; fetch cur1 into newf1, newf2, newf4, newf5;
SELECT '-1-', count, newf1, newf2, newf4, newf5; SELECT '-1-', count, newf1, newf2, newf4, newf5;
insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5); insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5);
set count= 4; set count = 4;
BEGIN BEGIN
while count> 0 do while count > 0 do
fetch cur1 into newf1, newf2, newf4, newf5; fetch cur1 into newf1, newf2, newf4, newf5;
SELECT '-2-', count, newf1, newf2, newf4, newf5; SELECT '-2-', count, newf1, newf2, newf4, newf5;
set count = count- 1; set count = count - 1;
END while; END while;
SELECT '-3-', count, newf1, newf2, newf4, newf4; SELECT '-3-', count, newf1, newf2, newf4, newf4;
END; END;
......
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result
View file @ bc3b4a2c
...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1; ...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
CREATE DATABASE db_storedproc; CREATE DATABASE db_storedproc;
CREATE DATABASE db_storedproc_1; CREATE DATABASE db_storedproc_1;
USE db_storedproc; USE db_storedproc;
create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1; engine = <engine_to_be_tested>;
create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2; create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
create table t3(f1 char(20),f2 char(20),f3 integer) engine = innodb; engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
USE db_storedproc_1; USE db_storedproc_1;
create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
USE db_storedproc; USE db_storedproc;
create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb; create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb; create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t9(f1 int, f2 char(25), f3 int) engine = innodb; create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10; engine = <engine_to_be_tested>;
create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
Section 3.1.3 - Syntax checks for the stored procedure-specific flow Section 3.1.3 - Syntax checks for the stored procedure-specific flow
control statements IF, CASE, LOOP, LEAVE, ITERATE, REPEAT, WHILE: control statements IF, CASE, LOOP, LEAVE, ITERATE, REPEAT, WHILE:
......
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
View file @ bc3b4a2c
...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1; ...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
CREATE DATABASE db_storedproc; CREATE DATABASE db_storedproc;
CREATE DATABASE db_storedproc_1; CREATE DATABASE db_storedproc_1;
USE db_storedproc; USE db_storedproc;
create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1; engine = <engine_to_be_tested>;
create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2; create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
create table t3(f1 char(20),f2 char(20),f3 integer) engine = innodb; engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
USE db_storedproc_1; USE db_storedproc_1;
create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
USE db_storedproc; USE db_storedproc;
create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb; create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb; create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t9(f1 int, f2 char(25), f3 int) engine = innodb; create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10; engine = <engine_to_be_tested>;
create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
Section 3.1.6 - Privilege Checks: Section 3.1.6 - Privilege Checks:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
View file @ bc3b4a2c
...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1; ...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
CREATE DATABASE db_storedproc; CREATE DATABASE db_storedproc;
CREATE DATABASE db_storedproc_1; CREATE DATABASE db_storedproc_1;
USE db_storedproc; USE db_storedproc;
create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1; engine = <engine_to_be_tested>;
create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2; create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
create table t3(f1 char(20),f2 char(20),f3 integer) engine = innodb; engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
USE db_storedproc_1; USE db_storedproc_1;
create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
USE db_storedproc; USE db_storedproc;
create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb; create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb; create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t9(f1 int, f2 char(25), f3 int) engine = innodb; create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10; engine = <engine_to_be_tested>;
create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
Section 3.1.7 - SQL mode checks: Section 3.1.7 - SQL mode checks:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
View file @ bc3b4a2c
...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1; ...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
CREATE DATABASE db_storedproc; CREATE DATABASE db_storedproc;
CREATE DATABASE db_storedproc_1; CREATE DATABASE db_storedproc_1;
USE db_storedproc; USE db_storedproc;
create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1; engine = <engine_to_be_tested>;
create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2; create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
create table t3(f1 char(20),f2 char(20),f3 integer) engine = innodb; engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
USE db_storedproc_1; USE db_storedproc_1;
create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
USE db_storedproc; USE db_storedproc;
create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb; create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb; create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t9(f1 int, f2 char(25), f3 int) engine = innodb; create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10; engine = <engine_to_be_tested>;
create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
Section 3.1.8 - SHOW statement checks: Section 3.1.8 - SHOW statement checks:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
View file @ bc3b4a2c
...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1; ...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
CREATE DATABASE db_storedproc; CREATE DATABASE db_storedproc;
CREATE DATABASE db_storedproc_1; CREATE DATABASE db_storedproc_1;
USE db_storedproc; USE db_storedproc;
create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1; engine = <engine_to_be_tested>;
create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2; create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
create table t3(f1 char(20),f2 char(20),f3 integer) engine = innodb; engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
USE db_storedproc_1; USE db_storedproc_1;
create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
USE db_storedproc; USE db_storedproc;
create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb; create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb; create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t9(f1 int, f2 char(25), f3 int) engine = innodb; create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10; engine = <engine_to_be_tested>;
create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
Section 3.1.10 - CALL checks: Section 3.1.10 - CALL checks:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
mysql-test/suite/funcs_1/r/innodb_trig_0102.result
View file @ bc3b4a2c
...@@ -64,7 +64,8 @@ Warnings: ...@@ -64,7 +64,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
into table tb3;
Testcase: 3.5.1.1: Testcase: 3.5.1.1:
------------------ ------------------
......
mysql-test/suite/funcs_1/r/innodb_trig_03.result
View file @ bc3b4a2c
...@@ -64,7 +64,8 @@ Warnings: ...@@ -64,7 +64,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
into table tb3;
Testcase 3.5.3: Testcase 3.5.3:
--------------- ---------------
...@@ -103,7 +104,7 @@ test_noprivs@localhost ...@@ -103,7 +104,7 @@ test_noprivs@localhost
use priv_db; use priv_db;
create trigger trg1_1 before INSERT on t1 for each row create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig 3.5.3.2_1-no'; set new.f1 = 'trig 3.5.3.2_1-no';
Got one of the listed errors ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
use priv_db; use priv_db;
insert into t1 (f1) values ('insert 3.5.3.2-no'); insert into t1 (f1) values ('insert 3.5.3.2-no');
select f1 from t1 order by f1; select f1 from t1 order by f1;
...@@ -135,7 +136,7 @@ Testcase 3.5.3.6: ...@@ -135,7 +136,7 @@ Testcase 3.5.3.6:
----------------- -----------------
use priv_db; use priv_db;
drop trigger trg1_2; drop trigger trg1_2;
Got one of the listed errors ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
use priv_db; use priv_db;
insert into t1 (f1) values ('insert 3.5.3.6-yes'); insert into t1 (f1) values ('insert 3.5.3.6-yes');
select f1 from t1 order by f1; select f1 from t1 order by f1;
......
mysql-test/suite/funcs_1/r/innodb_trig_03e.result
View file @ bc3b4a2c
...@@ -1214,7 +1214,7 @@ create definer=not_ex_user@localhost trigger trg1_0 ...@@ -1214,7 +1214,7 @@ create definer=not_ex_user@localhost trigger trg1_0
before INSERT on t1 for each row before INSERT on t1 for each row
set new.f1 = 'trig 1_0-yes'; set new.f1 = 'trig 1_0-yes';
Warnings: Warnings:
Note 1449 There is no 'not_ex_user'@'localhost' registered Note 1449 The user specified as a definer ('not_ex_user'@'localhost') does not exist
drop trigger trg1_0; drop trigger trg1_0;
create definer=test_yesprivs@localhost trigger trg1_0 create definer=test_yesprivs@localhost trigger trg1_0
before INSERT on t1 for each row before INSERT on t1 for each row
......
mysql-test/suite/funcs_1/r/innodb_trig_0407.result
View file @ bc3b4a2c
...@@ -64,7 +64,8 @@ Warnings: ...@@ -64,7 +64,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
into table tb3;
Testcase: 3.5: Testcase: 3.5:
-------------- --------------
......
mysql-test/suite/funcs_1/r/innodb_trig_08.result
View file @ bc3b4a2c
...@@ -64,7 +64,8 @@ Warnings: ...@@ -64,7 +64,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
into table tb3;
Testcase: 3.5: Testcase: 3.5:
-------------- --------------
......
mysql-test/suite/funcs_1/r/innodb_trig_09.result
View file @ bc3b4a2c
...@@ -64,7 +64,8 @@ Warnings: ...@@ -64,7 +64,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
into table tb3;
Testcase 3.5.9.1/2: Testcase 3.5.9.1/2:
------------------- -------------------
...@@ -241,6 +242,7 @@ ERROR HY000: There is no NEW row in on DELETE trigger ...@@ -241,6 +242,7 @@ ERROR HY000: There is no NEW row in on DELETE trigger
create trigger trg5b after DELETE on tb3 for each row create trigger trg5b after DELETE on tb3 for each row
set new.f122='test'; set new.f122='test';
ERROR HY000: There is no NEW row in on DELETE trigger ERROR HY000: There is no NEW row in on DELETE trigger
drop trigger trg5a;
drop trigger trg5b; drop trigger trg5b;
Testcase 3.5.9.10: (implied in previous tests) Testcase 3.5.9.10: (implied in previous tests)
......
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
View file @ bc3b4a2c
...@@ -64,7 +64,8 @@ Warnings: ...@@ -64,7 +64,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
into table tb3;
Testcase 3.5.10.1/2/3: Testcase 3.5.10.1/2/3:
---------------------- ----------------------
...@@ -141,7 +142,7 @@ set @counter= 0; ...@@ -141,7 +142,7 @@ set @counter= 0;
select @counter as 'Rows Loaded Before'; select @counter as 'Rows Loaded Before';
Rows Loaded Before Rows Loaded Before
0 0
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table tb_load;
select @counter as 'Rows Loaded After'; select @counter as 'Rows Loaded After';
Rows Loaded After Rows Loaded After
10 10
......
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
View file @ bc3b4a2c
...@@ -64,7 +64,8 @@ Warnings: ...@@ -64,7 +64,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
into table tb3;
Testcase x.x.x.1: Testcase x.x.x.1:
----------------- -----------------
......
mysql-test/suite/funcs_1/r/innodb_views.result
View file @ bc3b4a2c
...@@ -53,7 +53,8 @@ f107 year(4) not null default 2000, ...@@ -53,7 +53,8 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = innodb; ) engine = innodb;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb2.txt' into table tb2 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb2.txt'
into table tb2;
DROP DATABASE IF EXISTS test1; DROP DATABASE IF EXISTS test1;
CREATE DATABASE test1; CREATE DATABASE test1;
USE test1; USE test1;
...@@ -111,7 +112,8 @@ f107 year(4) not null default 2000, ...@@ -111,7 +112,8 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = innodb; ) engine = innodb;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb2.txt' into table tb2 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb2.txt'
into table tb2;
USE test; USE test;
! Attention: The file with the expected results is not ! Attention: The file with the expected results is not
......
mysql-test/suite/funcs_1/r/is_columns_innodb.result
View file @ bc3b4a2c
...@@ -76,7 +76,8 @@ Note 1265 Data truncated for column 'f45' at row 1 ...@@ -76,7 +76,8 @@ Note 1265 Data truncated for column 'f45' at row 1
Note 1265 Data truncated for column 'f47' at row 1 Note 1265 Data truncated for column 'f47' at row 1
Note 1265 Data truncated for column 'f49' at row 1 Note 1265 Data truncated for column 'f49' at row 1
Note 1265 Data truncated for column 'f51' at row 1 Note 1265 Data truncated for column 'f51' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb1.txt' into table tb1 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb1.txt'
into table tb1;
drop table if exists tb2 ; drop table if exists tb2 ;
create table tb2 ( create table tb2 (
f59 numeric (0) unsigned, f59 numeric (0) unsigned,
...@@ -131,7 +132,8 @@ f107 year(4) not null default 2000, ...@@ -131,7 +132,8 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = innodb; ) engine = innodb;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb2.txt' into table tb2 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb2.txt'
into table tb2;
drop table if exists tb3 ; drop table if exists tb3 ;
create table tb3 ( create table tb3 (
f118 char not null DEFAULT 'a', f118 char not null DEFAULT 'a',
...@@ -197,7 +199,8 @@ Warnings: ...@@ -197,7 +199,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
into table tb3;
drop table if exists tb4; drop table if exists tb4;
create table tb4 ( create table tb4 (
f176 numeric (0) unsigned not null DEFAULT 9, f176 numeric (0) unsigned not null DEFAULT 9,
...@@ -259,7 +262,8 @@ f239 varchar(20000) binary, ...@@ -259,7 +262,8 @@ f239 varchar(20000) binary,
f240 varchar(2000) unicode, f240 varchar(2000) unicode,
f241 char(100) unicode f241 char(100) unicode
) engine = innodb; ) engine = innodb;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb4.txt' into table tb4 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb4.txt'
into table tb4;
USE test1; USE test1;
drop table if exists tb2 ; drop table if exists tb2 ;
create table tb2 ( create table tb2 (
...@@ -315,33 +319,40 @@ f107 year(4) not null default 2000, ...@@ -315,33 +319,40 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = innodb; ) engine = innodb;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb2.txt' into table tb2 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb2.txt'
into table tb2;
USE test; USE test;
USE test; USE test;
DROP TABLE IF EXISTS t1, t2, t4, t10, t11; DROP TABLE IF EXISTS t1, t2, t4, t10, t11;
CREATE TABLE t1 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB; CREATE TABLE t1 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
CREATE TABLE t2 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB; ENGINE = InnoDB;
CREATE TABLE t4 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB; CREATE TABLE t2 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
CREATE TABLE t10 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB; ENGINE = InnoDB;
CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB; CREATE TABLE t4 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1; ENGINE = InnoDB;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2; CREATE TABLE t10 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4; ENGINE = InnoDB;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10; CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11; ENGINE = InnoDB;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t1;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t2;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t4;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t10;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t11;
drop TABLE if exists t3; drop TABLE if exists t3;
CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = InnoDB; CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = InnoDB;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' INTO TABLE t3;
drop database if exists test4; drop database if exists test4;
CREATE database test4; CREATE database test4;
use test4; use test4;
CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB; CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6; ENGINE = InnoDB;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t6;
use test; use test;
drop TABLE if exists t7, t8; drop TABLE if exists t7, t8;
CREATE TABLE t7 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = InnoDB; CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = InnoDB;
CREATE TABLE t8 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = InnoDB; CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = InnoDB;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -353,7 +364,7 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -353,7 +364,7 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -367,7 +378,7 @@ Warning 1265 Data truncated for column 'f3' at row 9 ...@@ -367,7 +378,7 @@ Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
drop TABLE if exists t9; drop TABLE if exists t9;
CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = InnoDB; CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = InnoDB;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
SELECT * FROM information_schema.columns SELECT * FROM information_schema.columns
WHERE table_schema LIKE 'test%' WHERE table_schema LIKE 'test%'
ORDER BY table_schema, table_name, column_name; ORDER BY table_schema, table_name, column_name;
......
mysql-test/suite/funcs_1/r/is_columns_memory.result
View file @ bc3b4a2c
...@@ -72,7 +72,8 @@ Note 1265 Data truncated for column 'f45' at row 1 ...@@ -72,7 +72,8 @@ Note 1265 Data truncated for column 'f45' at row 1
Note 1265 Data truncated for column 'f47' at row 1 Note 1265 Data truncated for column 'f47' at row 1
Note 1265 Data truncated for column 'f49' at row 1 Note 1265 Data truncated for column 'f49' at row 1
Note 1265 Data truncated for column 'f51' at row 1 Note 1265 Data truncated for column 'f51' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb1.txt' into table tb1 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb1.txt'
into table tb1;
drop table if exists tb2 ; drop table if exists tb2 ;
create table tb2 ( create table tb2 (
f59 numeric (0) unsigned, f59 numeric (0) unsigned,
...@@ -127,7 +128,8 @@ f107 year(4) not null default 2000, ...@@ -127,7 +128,8 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = memory; ) engine = memory;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb2.txt' into table tb2 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb2.txt'
into table tb2 ;
drop table if exists tb3; drop table if exists tb3;
create table tb3 ( create table tb3 (
f118 char not null DEFAULT 'a', f118 char not null DEFAULT 'a',
...@@ -187,7 +189,8 @@ Warnings: ...@@ -187,7 +189,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
into table tb3;
drop table if exists tb4 ; drop table if exists tb4 ;
create table tb4 ( create table tb4 (
f176 numeric (0) unsigned not null DEFAULT 9, f176 numeric (0) unsigned not null DEFAULT 9,
...@@ -248,7 +251,8 @@ f238 varchar(25000) binary, ...@@ -248,7 +251,8 @@ f238 varchar(25000) binary,
f239 varbinary(0), f239 varbinary(0),
f240 varchar(1200) unicode f240 varchar(1200) unicode
) engine = memory; ) engine = memory;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb4.txt' into table tb4 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb4.txt'
into table tb4;
USE test1; USE test1;
drop table if exists tb2 ; drop table if exists tb2 ;
create table tb2 ( create table tb2 (
...@@ -304,33 +308,40 @@ f107 year(4) not null default 2000, ...@@ -304,33 +308,40 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = memory; ) engine = memory;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb2.txt' into table tb2 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb2.txt'
into table tb2 ;
USE test; USE test;
USE test; USE test;
DROP TABLE IF EXISTS t1, t2, t4, t10, t11; DROP TABLE IF EXISTS t1, t2, t4, t10, t11;
CREATE TABLE t1 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY; CREATE TABLE t1 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
CREATE TABLE t2 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY; ENGINE = MEMORY;
CREATE TABLE t4 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY; CREATE TABLE t2 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
CREATE TABLE t10 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY; ENGINE = MEMORY;
CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY; CREATE TABLE t4 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1; ENGINE = MEMORY;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2; CREATE TABLE t10 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4; ENGINE = MEMORY;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10; CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11; ENGINE = MEMORY;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t1;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t2;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t4;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t10;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t11;
drop TABLE if exists t3; drop TABLE if exists t3;
CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = MEMORY; CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = MEMORY;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' INTO TABLE t3;
drop database if exists test4; drop database if exists test4;
CREATE database test4; CREATE database test4;
use test4; use test4;
CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY; CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6; ENGINE = MEMORY;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t6;
use test; use test;
drop TABLE if exists t7, t8; drop TABLE if exists t7, t8;
CREATE TABLE t7 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = MEMORY; CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = MEMORY;
CREATE TABLE t8 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = MEMORY; CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = MEMORY;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -342,7 +353,7 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -342,7 +353,7 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -356,7 +367,7 @@ Warning 1265 Data truncated for column 'f3' at row 9 ...@@ -356,7 +367,7 @@ Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
drop TABLE if exists t9; drop TABLE if exists t9;
CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = MEMORY; CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = MEMORY;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
SELECT * FROM information_schema.columns SELECT * FROM information_schema.columns
WHERE table_schema LIKE 'test%' WHERE table_schema LIKE 'test%'
ORDER BY table_schema, table_name, column_name; ORDER BY table_schema, table_name, column_name;
......
mysql-test/suite/funcs_1/r/is_columns_myisam.result
View file @ bc3b4a2c
...@@ -80,7 +80,8 @@ Note 1265 Data truncated for column 'f45' at row 1 ...@@ -80,7 +80,8 @@ Note 1265 Data truncated for column 'f45' at row 1
Note 1265 Data truncated for column 'f47' at row 1 Note 1265 Data truncated for column 'f47' at row 1
Note 1265 Data truncated for column 'f49' at row 1 Note 1265 Data truncated for column 'f49' at row 1
Note 1265 Data truncated for column 'f51' at row 1 Note 1265 Data truncated for column 'f51' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb1.txt' into table tb1 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb1.txt'
into table tb1;
drop table if exists tb2 ; drop table if exists tb2 ;
create table tb2 ( create table tb2 (
f59 numeric (0) unsigned, f59 numeric (0) unsigned,
...@@ -143,7 +144,8 @@ f115 VARBINARY(27) null , ...@@ -143,7 +144,8 @@ f115 VARBINARY(27) null ,
f116 VARBINARY(64) null, f116 VARBINARY(64) null,
f117 VARBINARY(192) null f117 VARBINARY(192) null
) engine = myisam; ) engine = myisam;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb2.txt' into table tb2 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb2.txt'
into table tb2;
drop table if exists tb3 ; drop table if exists tb3 ;
create table tb3 ( create table tb3 (
f118 char not null DEFAULT 'a', f118 char not null DEFAULT 'a',
...@@ -209,7 +211,8 @@ Warnings: ...@@ -209,7 +211,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
into table tb3;
drop table if exists tb4 ; drop table if exists tb4 ;
create table tb4 ( create table tb4 (
f176 numeric (0) unsigned not null DEFAULT 9, f176 numeric (0) unsigned not null DEFAULT 9,
...@@ -280,7 +283,8 @@ f240 varchar(120) unicode, ...@@ -280,7 +283,8 @@ f240 varchar(120) unicode,
f241 char(100) unicode, f241 char(100) unicode,
f242 bit(30) f242 bit(30)
) engine = myisam; ) engine = myisam;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb4.txt' into table tb4 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb4.txt'
into table tb4;
USE test1; USE test1;
drop table if exists tb2 ; drop table if exists tb2 ;
create table tb2 ( create table tb2 (
...@@ -344,33 +348,40 @@ f115 VARBINARY(27) null , ...@@ -344,33 +348,40 @@ f115 VARBINARY(27) null ,
f116 VARBINARY(64) null, f116 VARBINARY(64) null,
f117 VARBINARY(192) null f117 VARBINARY(192) null
) engine = myisam; ) engine = myisam;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb2.txt' into table tb2 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb2.txt'
into table tb2;
USE test; USE test;
USE test; USE test;
DROP TABLE IF EXISTS t1, t2, t4, t10, t11; DROP TABLE IF EXISTS t1, t2, t4, t10, t11;
CREATE TABLE t1 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM; CREATE TABLE t1 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
CREATE TABLE t2 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM; ENGINE = MyISAM;
CREATE TABLE t4 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM; CREATE TABLE t2 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
CREATE TABLE t10 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM; ENGINE = MyISAM;
CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM; CREATE TABLE t4 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1; ENGINE = MyISAM;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2; CREATE TABLE t10 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4; ENGINE = MyISAM;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10; CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11; ENGINE = MyISAM;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t1;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t2;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t4;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t10;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t11;
drop TABLE if exists t3; drop TABLE if exists t3;
CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = MyISAM; CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = MyISAM;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' INTO TABLE t3;
drop database if exists test4; drop database if exists test4;
CREATE database test4; CREATE database test4;
use test4; use test4;
CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM; CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6; ENGINE = MyISAM;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t6;
use test; use test;
drop TABLE if exists t7, t8; drop TABLE if exists t7, t8;
CREATE TABLE t7 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = MyISAM; CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = MyISAM;
CREATE TABLE t8 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = MyISAM; CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = MyISAM;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -382,7 +393,7 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -382,7 +393,7 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -396,7 +407,7 @@ Warning 1265 Data truncated for column 'f3' at row 9 ...@@ -396,7 +407,7 @@ Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
drop TABLE if exists t9; drop TABLE if exists t9;
CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = MyISAM; CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = MyISAM;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
SELECT * FROM information_schema.columns SELECT * FROM information_schema.columns
WHERE table_schema LIKE 'test%' WHERE table_schema LIKE 'test%'
ORDER BY table_schema, table_name, column_name; ORDER BY table_schema, table_name, column_name;
......
mysql-test/suite/funcs_1/r/is_columns_ndb.result
View file @ bc3b4a2c
...@@ -4,29 +4,35 @@ USE test; ...@@ -4,29 +4,35 @@ USE test;
USE test; USE test;
USE test; USE test;
DROP TABLE IF EXISTS t1, t2, t4, t10, t11; DROP TABLE IF EXISTS t1, t2, t4, t10, t11;
CREATE TABLE t1 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = ndb; CREATE TABLE t1 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
CREATE TABLE t2 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = ndb; ENGINE = ndb;
CREATE TABLE t4 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = ndb; CREATE TABLE t2 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
CREATE TABLE t10 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = ndb; ENGINE = ndb;
CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = ndb; CREATE TABLE t4 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1; ENGINE = ndb;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2; CREATE TABLE t10 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4; ENGINE = ndb;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10; CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11; ENGINE = ndb;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t1;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t2;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t4;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t10;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t11;
drop TABLE if exists t3; drop TABLE if exists t3;
CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = ndb; CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = ndb;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' INTO TABLE t3;
drop database if exists test4; drop database if exists test4;
CREATE database test4; CREATE database test4;
use test4; use test4;
CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = ndb; CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6; ENGINE = ndb;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t6;
use test; use test;
drop TABLE if exists t7, t8; drop TABLE if exists t7, t8;
CREATE TABLE t7 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = ndb; CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = ndb;
CREATE TABLE t8 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = ndb; CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = ndb;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -38,7 +44,7 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -38,7 +44,7 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -52,7 +58,7 @@ Warning 1265 Data truncated for column 'f3' at row 9 ...@@ -52,7 +58,7 @@ Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
drop TABLE if exists t9; drop TABLE if exists t9;
CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = ndb; CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = ndb;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
SELECT * FROM information_schema.columns SELECT * FROM information_schema.columns
WHERE table_schema LIKE 'test%' WHERE table_schema LIKE 'test%'
ORDER BY table_schema, table_name, column_name; ORDER BY table_schema, table_name, column_name;
......
mysql-test/suite/funcs_1/r/is_tables_innodb.result
View file @ bc3b4a2c
...@@ -76,7 +76,8 @@ Note 1265 Data truncated for column 'f45' at row 1 ...@@ -76,7 +76,8 @@ Note 1265 Data truncated for column 'f45' at row 1
Note 1265 Data truncated for column 'f47' at row 1 Note 1265 Data truncated for column 'f47' at row 1
Note 1265 Data truncated for column 'f49' at row 1 Note 1265 Data truncated for column 'f49' at row 1
Note 1265 Data truncated for column 'f51' at row 1 Note 1265 Data truncated for column 'f51' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb1.txt' into table tb1 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb1.txt'
into table tb1;
drop table if exists tb2 ; drop table if exists tb2 ;
create table tb2 ( create table tb2 (
f59 numeric (0) unsigned, f59 numeric (0) unsigned,
...@@ -131,7 +132,8 @@ f107 year(4) not null default 2000, ...@@ -131,7 +132,8 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = innodb; ) engine = innodb;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb2.txt' into table tb2 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb2.txt'
into table tb2;
drop table if exists tb3 ; drop table if exists tb3 ;
create table tb3 ( create table tb3 (
f118 char not null DEFAULT 'a', f118 char not null DEFAULT 'a',
...@@ -197,7 +199,8 @@ Warnings: ...@@ -197,7 +199,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
into table tb3;
drop table if exists tb4; drop table if exists tb4;
create table tb4 ( create table tb4 (
f176 numeric (0) unsigned not null DEFAULT 9, f176 numeric (0) unsigned not null DEFAULT 9,
...@@ -259,7 +262,8 @@ f239 varchar(20000) binary, ...@@ -259,7 +262,8 @@ f239 varchar(20000) binary,
f240 varchar(2000) unicode, f240 varchar(2000) unicode,
f241 char(100) unicode f241 char(100) unicode
) engine = innodb; ) engine = innodb;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb4.txt' into table tb4 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb4.txt'
into table tb4;
USE test1; USE test1;
drop table if exists tb2 ; drop table if exists tb2 ;
create table tb2 ( create table tb2 (
...@@ -315,33 +319,40 @@ f107 year(4) not null default 2000, ...@@ -315,33 +319,40 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = innodb; ) engine = innodb;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb2.txt' into table tb2 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb2.txt'
into table tb2;
USE test; USE test;
USE test; USE test;
DROP TABLE IF EXISTS t1, t2, t4, t10, t11; DROP TABLE IF EXISTS t1, t2, t4, t10, t11;
CREATE TABLE t1 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB; CREATE TABLE t1 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
CREATE TABLE t2 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB; ENGINE = InnoDB;
CREATE TABLE t4 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB; CREATE TABLE t2 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
CREATE TABLE t10 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB; ENGINE = InnoDB;
CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB; CREATE TABLE t4 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1; ENGINE = InnoDB;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2; CREATE TABLE t10 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4; ENGINE = InnoDB;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10; CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11; ENGINE = InnoDB;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t1;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t2;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t4;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t10;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t11;
drop TABLE if exists t3; drop TABLE if exists t3;
CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = InnoDB; CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = InnoDB;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' INTO TABLE t3;
drop database if exists test4; drop database if exists test4;
CREATE database test4; CREATE database test4;
use test4; use test4;
CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB; CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6; ENGINE = InnoDB;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t6;
use test; use test;
drop TABLE if exists t7, t8; drop TABLE if exists t7, t8;
CREATE TABLE t7 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = InnoDB; CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = InnoDB;
CREATE TABLE t8 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = InnoDB; CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = InnoDB;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -353,7 +364,7 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -353,7 +364,7 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -367,7 +378,7 @@ Warning 1265 Data truncated for column 'f3' at row 9 ...@@ -367,7 +378,7 @@ Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
drop TABLE if exists t9; drop TABLE if exists t9;
CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = InnoDB; CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = InnoDB;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
DROP DATABASE IF EXISTS db_datadict; DROP DATABASE IF EXISTS db_datadict;
CREATE DATABASE db_datadict; CREATE DATABASE db_datadict;
SELECT *, SELECT *,
......
mysql-test/suite/funcs_1/r/is_tables_memory.result
View file @ bc3b4a2c
...@@ -72,7 +72,8 @@ Note 1265 Data truncated for column 'f45' at row 1 ...@@ -72,7 +72,8 @@ Note 1265 Data truncated for column 'f45' at row 1
Note 1265 Data truncated for column 'f47' at row 1 Note 1265 Data truncated for column 'f47' at row 1
Note 1265 Data truncated for column 'f49' at row 1 Note 1265 Data truncated for column 'f49' at row 1
Note 1265 Data truncated for column 'f51' at row 1 Note 1265 Data truncated for column 'f51' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb1.txt' into table tb1 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb1.txt'
into table tb1;
drop table if exists tb2 ; drop table if exists tb2 ;
create table tb2 ( create table tb2 (
f59 numeric (0) unsigned, f59 numeric (0) unsigned,
...@@ -127,7 +128,8 @@ f107 year(4) not null default 2000, ...@@ -127,7 +128,8 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = memory; ) engine = memory;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb2.txt' into table tb2 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb2.txt'
into table tb2 ;
drop table if exists tb3; drop table if exists tb3;
create table tb3 ( create table tb3 (
f118 char not null DEFAULT 'a', f118 char not null DEFAULT 'a',
...@@ -187,7 +189,8 @@ Warnings: ...@@ -187,7 +189,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
into table tb3;
drop table if exists tb4 ; drop table if exists tb4 ;
create table tb4 ( create table tb4 (
f176 numeric (0) unsigned not null DEFAULT 9, f176 numeric (0) unsigned not null DEFAULT 9,
...@@ -248,7 +251,8 @@ f238 varchar(25000) binary, ...@@ -248,7 +251,8 @@ f238 varchar(25000) binary,
f239 varbinary(0), f239 varbinary(0),
f240 varchar(1200) unicode f240 varchar(1200) unicode
) engine = memory; ) engine = memory;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb4.txt' into table tb4 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb4.txt'
into table tb4;
USE test1; USE test1;
drop table if exists tb2 ; drop table if exists tb2 ;
create table tb2 ( create table tb2 (
...@@ -304,33 +308,40 @@ f107 year(4) not null default 2000, ...@@ -304,33 +308,40 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = memory; ) engine = memory;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb2.txt' into table tb2 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb2.txt'
into table tb2 ;
USE test; USE test;
USE test; USE test;
DROP TABLE IF EXISTS t1, t2, t4, t10, t11; DROP TABLE IF EXISTS t1, t2, t4, t10, t11;
CREATE TABLE t1 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY; CREATE TABLE t1 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
CREATE TABLE t2 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY; ENGINE = MEMORY;
CREATE TABLE t4 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY; CREATE TABLE t2 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
CREATE TABLE t10 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY; ENGINE = MEMORY;
CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY; CREATE TABLE t4 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1; ENGINE = MEMORY;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2; CREATE TABLE t10 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4; ENGINE = MEMORY;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10; CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11; ENGINE = MEMORY;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t1;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t2;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t4;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t10;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t11;
drop TABLE if exists t3; drop TABLE if exists t3;
CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = MEMORY; CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = MEMORY;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' INTO TABLE t3;
drop database if exists test4; drop database if exists test4;
CREATE database test4; CREATE database test4;
use test4; use test4;
CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY; CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6; ENGINE = MEMORY;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t6;
use test; use test;
drop TABLE if exists t7, t8; drop TABLE if exists t7, t8;
CREATE TABLE t7 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = MEMORY; CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = MEMORY;
CREATE TABLE t8 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = MEMORY; CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = MEMORY;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -342,7 +353,7 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -342,7 +353,7 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -356,7 +367,7 @@ Warning 1265 Data truncated for column 'f3' at row 9 ...@@ -356,7 +367,7 @@ Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
drop TABLE if exists t9; drop TABLE if exists t9;
CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = MEMORY; CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = MEMORY;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
DROP DATABASE IF EXISTS db_datadict; DROP DATABASE IF EXISTS db_datadict;
CREATE DATABASE db_datadict; CREATE DATABASE db_datadict;
SELECT *, SELECT *,
......
mysql-test/suite/funcs_1/r/is_tables_myisam.result
View file @ bc3b4a2c
...@@ -80,7 +80,8 @@ Note 1265 Data truncated for column 'f45' at row 1 ...@@ -80,7 +80,8 @@ Note 1265 Data truncated for column 'f45' at row 1
Note 1265 Data truncated for column 'f47' at row 1 Note 1265 Data truncated for column 'f47' at row 1
Note 1265 Data truncated for column 'f49' at row 1 Note 1265 Data truncated for column 'f49' at row 1
Note 1265 Data truncated for column 'f51' at row 1 Note 1265 Data truncated for column 'f51' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb1.txt' into table tb1 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb1.txt'
into table tb1;
drop table if exists tb2 ; drop table if exists tb2 ;
create table tb2 ( create table tb2 (
f59 numeric (0) unsigned, f59 numeric (0) unsigned,
...@@ -143,7 +144,8 @@ f115 VARBINARY(27) null , ...@@ -143,7 +144,8 @@ f115 VARBINARY(27) null ,
f116 VARBINARY(64) null, f116 VARBINARY(64) null,
f117 VARBINARY(192) null f117 VARBINARY(192) null
) engine = myisam; ) engine = myisam;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb2.txt' into table tb2 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb2.txt'
into table tb2;
drop table if exists tb3 ; drop table if exists tb3 ;
create table tb3 ( create table tb3 (
f118 char not null DEFAULT 'a', f118 char not null DEFAULT 'a',
...@@ -209,7 +211,8 @@ Warnings: ...@@ -209,7 +211,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
into table tb3;
drop table if exists tb4 ; drop table if exists tb4 ;
create table tb4 ( create table tb4 (
f176 numeric (0) unsigned not null DEFAULT 9, f176 numeric (0) unsigned not null DEFAULT 9,
...@@ -280,7 +283,8 @@ f240 varchar(120) unicode, ...@@ -280,7 +283,8 @@ f240 varchar(120) unicode,
f241 char(100) unicode, f241 char(100) unicode,
f242 bit(30) f242 bit(30)
) engine = myisam; ) engine = myisam;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb4.txt' into table tb4 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb4.txt'
into table tb4;
USE test1; USE test1;
drop table if exists tb2 ; drop table if exists tb2 ;
create table tb2 ( create table tb2 (
...@@ -344,33 +348,40 @@ f115 VARBINARY(27) null , ...@@ -344,33 +348,40 @@ f115 VARBINARY(27) null ,
f116 VARBINARY(64) null, f116 VARBINARY(64) null,
f117 VARBINARY(192) null f117 VARBINARY(192) null
) engine = myisam; ) engine = myisam;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb2.txt' into table tb2 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb2.txt'
into table tb2;
USE test; USE test;
USE test; USE test;
DROP TABLE IF EXISTS t1, t2, t4, t10, t11; DROP TABLE IF EXISTS t1, t2, t4, t10, t11;
CREATE TABLE t1 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM; CREATE TABLE t1 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
CREATE TABLE t2 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM; ENGINE = MyISAM;
CREATE TABLE t4 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM; CREATE TABLE t2 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
CREATE TABLE t10 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM; ENGINE = MyISAM;
CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM; CREATE TABLE t4 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1; ENGINE = MyISAM;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2; CREATE TABLE t10 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4; ENGINE = MyISAM;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10; CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11; ENGINE = MyISAM;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t1;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t2;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t4;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t10;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t11;
drop TABLE if exists t3; drop TABLE if exists t3;
CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = MyISAM; CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = MyISAM;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' INTO TABLE t3;
drop database if exists test4; drop database if exists test4;
CREATE database test4; CREATE database test4;
use test4; use test4;
CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM; CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6; ENGINE = MyISAM;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t6;
use test; use test;
drop TABLE if exists t7, t8; drop TABLE if exists t7, t8;
CREATE TABLE t7 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = MyISAM; CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = MyISAM;
CREATE TABLE t8 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = MyISAM; CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = MyISAM;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -382,7 +393,7 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -382,7 +393,7 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -396,7 +407,7 @@ Warning 1265 Data truncated for column 'f3' at row 9 ...@@ -396,7 +407,7 @@ Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
drop TABLE if exists t9; drop TABLE if exists t9;
CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = MyISAM; CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = MyISAM;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
DROP DATABASE IF EXISTS db_datadict; DROP DATABASE IF EXISTS db_datadict;
CREATE DATABASE db_datadict; CREATE DATABASE db_datadict;
SELECT *, SELECT *,
......
mysql-test/suite/funcs_1/r/is_tables_ndb.result
View file @ bc3b4a2c
...@@ -4,29 +4,35 @@ USE test; ...@@ -4,29 +4,35 @@ USE test;
USE test; USE test;
USE test; USE test;
DROP TABLE IF EXISTS t1, t2, t4, t10, t11; DROP TABLE IF EXISTS t1, t2, t4, t10, t11;
CREATE TABLE t1 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = NDB; CREATE TABLE t1 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
CREATE TABLE t2 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = NDB; ENGINE = NDB;
CREATE TABLE t4 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = NDB; CREATE TABLE t2 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
CREATE TABLE t10 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = NDB; ENGINE = NDB;
CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = NDB; CREATE TABLE t4 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1; ENGINE = NDB;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2; CREATE TABLE t10 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4; ENGINE = NDB;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10; CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11; ENGINE = NDB;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t1;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t2;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t4;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t10;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t11;
drop TABLE if exists t3; drop TABLE if exists t3;
CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = NDB; CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = NDB;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' INTO TABLE t3;
drop database if exists test4; drop database if exists test4;
CREATE database test4; CREATE database test4;
use test4; use test4;
CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = NDB; CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6; ENGINE = NDB;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t6;
use test; use test;
drop TABLE if exists t7, t8; drop TABLE if exists t7, t8;
CREATE TABLE t7 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = NDB; CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = NDB;
CREATE TABLE t8 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = NDB; CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = NDB;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -38,7 +44,7 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -38,7 +44,7 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -52,7 +58,7 @@ Warning 1265 Data truncated for column 'f3' at row 9 ...@@ -52,7 +58,7 @@ Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
drop TABLE if exists t9; drop TABLE if exists t9;
CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = NDB; CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = NDB;
LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9; LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
DROP DATABASE IF EXISTS db_datadict; DROP DATABASE IF EXISTS db_datadict;
CREATE DATABASE db_datadict; CREATE DATABASE db_datadict;
SELECT *, SELECT *,
......
mysql-test/suite/funcs_1/r/memory_storedproc_02.result
View file @ bc3b4a2c
...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1; ...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
CREATE DATABASE db_storedproc; CREATE DATABASE db_storedproc;
CREATE DATABASE db_storedproc_1; CREATE DATABASE db_storedproc_1;
USE db_storedproc; USE db_storedproc;
create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1; engine = <engine_to_be_tested>;
create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2; create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
create table t3(f1 char(20),f2 char(20),f3 integer) engine = memory; engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
USE db_storedproc_1; USE db_storedproc_1;
create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
USE db_storedproc; USE db_storedproc;
create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory; create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory; create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t9(f1 int, f2 char(25), f3 int) engine = memory; create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10; engine = <engine_to_be_tested>;
create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
Section 3.1.2 - Syntax checks for the stored procedure-specific Section 3.1.2 - Syntax checks for the stored procedure-specific
programming statements BEGIN/END, DECLARE, SET, SELECT/INTO, OPEN, FETCH, CLOSE: programming statements BEGIN/END, DECLARE, SET, SELECT/INTO, OPEN, FETCH, CLOSE:
...@@ -698,7 +706,7 @@ Testcase 3.1.2.54: ...@@ -698,7 +706,7 @@ Testcase 3.1.2.54:
------------------ ------------------
Ensure that a handler with a condition defined with an SQLSTATE that begins with Ensure that a handler with a condition defined with an SQLSTATE that begins with
01 is always exactly equivalent in action to a handler with an SQLWARNING “01“ is always exactly equivalent in action to a handler with an SQLWARNING
condition. condition.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
DROP PROCEDURE IF EXISTS sp0; DROP PROCEDURE IF EXISTS sp0;
...@@ -797,7 +805,7 @@ Testcase 3.1.2.56: ...@@ -797,7 +805,7 @@ Testcase 3.1.2.56:
------------------ ------------------
Ensure that a handler with a condition defined with an SQLSTATE that begins with Ensure that a handler with a condition defined with an SQLSTATE that begins with
02 is always exactly equivalent in action to a handler with a NOT FOUND “02“ is always exactly equivalent in action to a handler with a NOT FOUND
condition. condition.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
DROP PROCEDURE IF EXISTS sp0; DROP PROCEDURE IF EXISTS sp0;
...@@ -905,7 +913,7 @@ Testcase 3.1.2.58: ...@@ -905,7 +913,7 @@ Testcase 3.1.2.58:
------------------ ------------------
Ensure that a handler with a condition defined with an SQLSTATE that begins with Ensure that a handler with a condition defined with an SQLSTATE that begins with
anything other that 01 or 02 is always exactly equivalent in action to a anything other that “01“ or “02“ is always exactly equivalent in action to a
handler with an SQLEXCEPTION condition. handler with an SQLEXCEPTION condition.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
DROP PROCEDURE IF EXISTS sp0; DROP PROCEDURE IF EXISTS sp0;
...@@ -1194,16 +1202,16 @@ declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by ...@@ -1194,16 +1202,16 @@ declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by
open cur1; open cur1;
open cur2; open cur2;
BEGIN BEGIN
declare continue handler for sqlstate '02000' set count=1; declare continue handler for sqlstate '02000' set count = 1;
fetch cur1 into newf1, newf2, newf4, newf5; fetch cur1 into newf1, newf2, newf4, newf5;
SELECT '-1-', count, newf1, newf2, newf4, newf5; SELECT '-1-', count, newf1, newf2, newf4, newf5;
insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5); insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5);
set count= 4; set count = 4;
BEGIN BEGIN
while count> 0 do while count > 0 do
fetch cur1 into newf1, newf2, newf4, newf5; fetch cur1 into newf1, newf2, newf4, newf5;
SELECT '-2-', count, newf1, newf2, newf4, newf5; SELECT '-2-', count, newf1, newf2, newf4, newf5;
set count = count- 1; set count = count - 1;
END while; END while;
SELECT '-3-', count, newf1, newf2, newf4, newf4; SELECT '-3-', count, newf1, newf2, newf4, newf4;
END; END;
......
mysql-test/suite/funcs_1/r/memory_storedproc_03.result
View file @ bc3b4a2c
...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1; ...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
CREATE DATABASE db_storedproc; CREATE DATABASE db_storedproc;
CREATE DATABASE db_storedproc_1; CREATE DATABASE db_storedproc_1;
USE db_storedproc; USE db_storedproc;
create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1; engine = <engine_to_be_tested>;
create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2; create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
create table t3(f1 char(20),f2 char(20),f3 integer) engine = memory; engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
USE db_storedproc_1; USE db_storedproc_1;
create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
USE db_storedproc; USE db_storedproc;
create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory; create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory; create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t9(f1 int, f2 char(25), f3 int) engine = memory; create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10; engine = <engine_to_be_tested>;
create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
Section 3.1.3 - Syntax checks for the stored procedure-specific flow Section 3.1.3 - Syntax checks for the stored procedure-specific flow
control statements IF, CASE, LOOP, LEAVE, ITERATE, REPEAT, WHILE: control statements IF, CASE, LOOP, LEAVE, ITERATE, REPEAT, WHILE:
......
mysql-test/suite/funcs_1/r/memory_storedproc_06.result
View file @ bc3b4a2c
...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1; ...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
CREATE DATABASE db_storedproc; CREATE DATABASE db_storedproc;
CREATE DATABASE db_storedproc_1; CREATE DATABASE db_storedproc_1;
USE db_storedproc; USE db_storedproc;
create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1; engine = <engine_to_be_tested>;
create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2; create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
create table t3(f1 char(20),f2 char(20),f3 integer) engine = memory; engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
USE db_storedproc_1; USE db_storedproc_1;
create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
USE db_storedproc; USE db_storedproc;
create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory; create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory; create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t9(f1 int, f2 char(25), f3 int) engine = memory; create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10; engine = <engine_to_be_tested>;
create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
Section 3.1.6 - Privilege Checks: Section 3.1.6 - Privilege Checks:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
mysql-test/suite/funcs_1/r/memory_storedproc_07.result
View file @ bc3b4a2c
...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1; ...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
CREATE DATABASE db_storedproc; CREATE DATABASE db_storedproc;
CREATE DATABASE db_storedproc_1; CREATE DATABASE db_storedproc_1;
USE db_storedproc; USE db_storedproc;
create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1; engine = <engine_to_be_tested>;
create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2; create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
create table t3(f1 char(20),f2 char(20),f3 integer) engine = memory; engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
USE db_storedproc_1; USE db_storedproc_1;
create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
USE db_storedproc; USE db_storedproc;
create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory; create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory; create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t9(f1 int, f2 char(25), f3 int) engine = memory; create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10; engine = <engine_to_be_tested>;
create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
Section 3.1.7 - SQL mode checks: Section 3.1.7 - SQL mode checks:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
mysql-test/suite/funcs_1/r/memory_storedproc_08.result
View file @ bc3b4a2c
...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1; ...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
CREATE DATABASE db_storedproc; CREATE DATABASE db_storedproc;
CREATE DATABASE db_storedproc_1; CREATE DATABASE db_storedproc_1;
USE db_storedproc; USE db_storedproc;
create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1; engine = <engine_to_be_tested>;
create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2; create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
create table t3(f1 char(20),f2 char(20),f3 integer) engine = memory; engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
USE db_storedproc_1; USE db_storedproc_1;
create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
USE db_storedproc; USE db_storedproc;
create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory; create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory; create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t9(f1 int, f2 char(25), f3 int) engine = memory; create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10; engine = <engine_to_be_tested>;
create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
Section 3.1.8 - SHOW statement checks: Section 3.1.8 - SHOW statement checks:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
mysql-test/suite/funcs_1/r/memory_storedproc_10.result
View file @ bc3b4a2c
...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1; ...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
CREATE DATABASE db_storedproc; CREATE DATABASE db_storedproc;
CREATE DATABASE db_storedproc_1; CREATE DATABASE db_storedproc_1;
USE db_storedproc; USE db_storedproc;
create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1; engine = <engine_to_be_tested>;
create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2; create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
create table t3(f1 char(20),f2 char(20),f3 integer) engine = memory; engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
USE db_storedproc_1; USE db_storedproc_1;
create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
USE db_storedproc; USE db_storedproc;
create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory; create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory; create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t9(f1 int, f2 char(25), f3 int) engine = memory; create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10; engine = <engine_to_be_tested>;
create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
Section 3.1.10 - CALL checks: Section 3.1.10 - CALL checks:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
mysql-test/suite/funcs_1/r/memory_trig_0102.result
View file @ bc3b4a2c
...@@ -58,7 +58,8 @@ Warnings: ...@@ -58,7 +58,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
into table tb3;
Testcase: 3.5.1.1: Testcase: 3.5.1.1:
------------------ ------------------
......
mysql-test/suite/funcs_1/r/memory_trig_03.result
View file @ bc3b4a2c
...@@ -58,7 +58,8 @@ Warnings: ...@@ -58,7 +58,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
into table tb3;
Testcase 3.5.3: Testcase 3.5.3:
--------------- ---------------
...@@ -97,7 +98,7 @@ test_noprivs@localhost ...@@ -97,7 +98,7 @@ test_noprivs@localhost
use priv_db; use priv_db;
create trigger trg1_1 before INSERT on t1 for each row create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig 3.5.3.2_1-no'; set new.f1 = 'trig 3.5.3.2_1-no';
Got one of the listed errors ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
use priv_db; use priv_db;
insert into t1 (f1) values ('insert 3.5.3.2-no'); insert into t1 (f1) values ('insert 3.5.3.2-no');
select f1 from t1 order by f1; select f1 from t1 order by f1;
...@@ -129,7 +130,7 @@ Testcase 3.5.3.6: ...@@ -129,7 +130,7 @@ Testcase 3.5.3.6:
----------------- -----------------
use priv_db; use priv_db;
drop trigger trg1_2; drop trigger trg1_2;
Got one of the listed errors ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
use priv_db; use priv_db;
insert into t1 (f1) values ('insert 3.5.3.6-yes'); insert into t1 (f1) values ('insert 3.5.3.6-yes');
select f1 from t1 order by f1; select f1 from t1 order by f1;
......
mysql-test/suite/funcs_1/r/memory_trig_03e.result
View file @ bc3b4a2c
...@@ -1214,7 +1214,7 @@ create definer=not_ex_user@localhost trigger trg1_0 ...@@ -1214,7 +1214,7 @@ create definer=not_ex_user@localhost trigger trg1_0
before INSERT on t1 for each row before INSERT on t1 for each row
set new.f1 = 'trig 1_0-yes'; set new.f1 = 'trig 1_0-yes';
Warnings: Warnings:
Note 1449 There is no 'not_ex_user'@'localhost' registered Note 1449 The user specified as a definer ('not_ex_user'@'localhost') does not exist
drop trigger trg1_0; drop trigger trg1_0;
create definer=test_yesprivs@localhost trigger trg1_0 create definer=test_yesprivs@localhost trigger trg1_0
before INSERT on t1 for each row before INSERT on t1 for each row
......
mysql-test/suite/funcs_1/r/memory_trig_0407.result
View file @ bc3b4a2c
...@@ -58,7 +58,8 @@ Warnings: ...@@ -58,7 +58,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
into table tb3;
Testcase: 3.5: Testcase: 3.5:
-------------- --------------
......
mysql-test/suite/funcs_1/r/memory_trig_08.result
View file @ bc3b4a2c
...@@ -58,7 +58,8 @@ Warnings: ...@@ -58,7 +58,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
into table tb3;
Testcase: 3.5: Testcase: 3.5:
-------------- --------------
......
mysql-test/suite/funcs_1/r/memory_trig_09.result
View file @ bc3b4a2c
...@@ -58,7 +58,8 @@ Warnings: ...@@ -58,7 +58,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
into table tb3;
Testcase 3.5.9.1/2: Testcase 3.5.9.1/2:
------------------- -------------------
...@@ -235,6 +236,7 @@ ERROR HY000: There is no NEW row in on DELETE trigger ...@@ -235,6 +236,7 @@ ERROR HY000: There is no NEW row in on DELETE trigger
create trigger trg5b after DELETE on tb3 for each row create trigger trg5b after DELETE on tb3 for each row
set new.f122='test'; set new.f122='test';
ERROR HY000: There is no NEW row in on DELETE trigger ERROR HY000: There is no NEW row in on DELETE trigger
drop trigger trg5a;
drop trigger trg5b; drop trigger trg5b;
Testcase 3.5.9.10: (implied in previous tests) Testcase 3.5.9.10: (implied in previous tests)
......
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
View file @ bc3b4a2c
...@@ -58,7 +58,8 @@ Warnings: ...@@ -58,7 +58,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
into table tb3;
Testcase 3.5.10.1/2/3: Testcase 3.5.10.1/2/3:
---------------------- ----------------------
...@@ -135,7 +136,7 @@ set @counter= 0; ...@@ -135,7 +136,7 @@ set @counter= 0;
select @counter as 'Rows Loaded Before'; select @counter as 'Rows Loaded Before';
Rows Loaded Before Rows Loaded Before
0 0
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table tb_load;
select @counter as 'Rows Loaded After'; select @counter as 'Rows Loaded After';
Rows Loaded After Rows Loaded After
10 10
......
mysql-test/suite/funcs_1/r/memory_views.result
View file @ bc3b4a2c
...@@ -53,7 +53,8 @@ f107 year(4) not null default 2000, ...@@ -53,7 +53,8 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = memory; ) engine = memory;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb2.txt' into table tb2 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb2.txt'
into table tb2 ;
DROP DATABASE IF EXISTS test1; DROP DATABASE IF EXISTS test1;
CREATE DATABASE test1; CREATE DATABASE test1;
USE test1; USE test1;
...@@ -111,7 +112,8 @@ f107 year(4) not null default 2000, ...@@ -111,7 +112,8 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = memory; ) engine = memory;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb2.txt' into table tb2 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb2.txt'
into table tb2 ;
USE test; USE test;
! Attention: The file with the expected results is not ! Attention: The file with the expected results is not
......
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
View file @ bc3b4a2c
...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1; ...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
CREATE DATABASE db_storedproc; CREATE DATABASE db_storedproc;
CREATE DATABASE db_storedproc_1; CREATE DATABASE db_storedproc_1;
USE db_storedproc; USE db_storedproc;
create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1; engine = <engine_to_be_tested>;
create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2; create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
create table t3(f1 char(20),f2 char(20),f3 integer) engine = myisam; engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
USE db_storedproc_1; USE db_storedproc_1;
create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
USE db_storedproc; USE db_storedproc;
create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam; create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam; create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t9(f1 int, f2 char(25), f3 int) engine = myisam; create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10; engine = <engine_to_be_tested>;
create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
Section 3.1.2 - Syntax checks for the stored procedure-specific Section 3.1.2 - Syntax checks for the stored procedure-specific
programming statements BEGIN/END, DECLARE, SET, SELECT/INTO, OPEN, FETCH, CLOSE: programming statements BEGIN/END, DECLARE, SET, SELECT/INTO, OPEN, FETCH, CLOSE:
...@@ -698,7 +706,7 @@ Testcase 3.1.2.54: ...@@ -698,7 +706,7 @@ Testcase 3.1.2.54:
------------------ ------------------
Ensure that a handler with a condition defined with an SQLSTATE that begins with Ensure that a handler with a condition defined with an SQLSTATE that begins with
01 is always exactly equivalent in action to a handler with an SQLWARNING “01“ is always exactly equivalent in action to a handler with an SQLWARNING
condition. condition.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
DROP PROCEDURE IF EXISTS sp0; DROP PROCEDURE IF EXISTS sp0;
...@@ -797,7 +805,7 @@ Testcase 3.1.2.56: ...@@ -797,7 +805,7 @@ Testcase 3.1.2.56:
------------------ ------------------
Ensure that a handler with a condition defined with an SQLSTATE that begins with Ensure that a handler with a condition defined with an SQLSTATE that begins with
02 is always exactly equivalent in action to a handler with a NOT FOUND “02“ is always exactly equivalent in action to a handler with a NOT FOUND
condition. condition.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
DROP PROCEDURE IF EXISTS sp0; DROP PROCEDURE IF EXISTS sp0;
...@@ -905,7 +913,7 @@ Testcase 3.1.2.58: ...@@ -905,7 +913,7 @@ Testcase 3.1.2.58:
------------------ ------------------
Ensure that a handler with a condition defined with an SQLSTATE that begins with Ensure that a handler with a condition defined with an SQLSTATE that begins with
anything other that 01 or 02 is always exactly equivalent in action to a anything other that “01“ or “02“ is always exactly equivalent in action to a
handler with an SQLEXCEPTION condition. handler with an SQLEXCEPTION condition.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
DROP PROCEDURE IF EXISTS sp0; DROP PROCEDURE IF EXISTS sp0;
...@@ -1194,16 +1202,16 @@ declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by ...@@ -1194,16 +1202,16 @@ declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by
open cur1; open cur1;
open cur2; open cur2;
BEGIN BEGIN
declare continue handler for sqlstate '02000' set count=1; declare continue handler for sqlstate '02000' set count = 1;
fetch cur1 into newf1, newf2, newf4, newf5; fetch cur1 into newf1, newf2, newf4, newf5;
SELECT '-1-', count, newf1, newf2, newf4, newf5; SELECT '-1-', count, newf1, newf2, newf4, newf5;
insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5); insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5);
set count= 4; set count = 4;
BEGIN BEGIN
while count> 0 do while count > 0 do
fetch cur1 into newf1, newf2, newf4, newf5; fetch cur1 into newf1, newf2, newf4, newf5;
SELECT '-2-', count, newf1, newf2, newf4, newf5; SELECT '-2-', count, newf1, newf2, newf4, newf5;
set count = count- 1; set count = count - 1;
END while; END while;
SELECT '-3-', count, newf1, newf2, newf4, newf4; SELECT '-3-', count, newf1, newf2, newf4, newf4;
END; END;
......
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result
View file @ bc3b4a2c
...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1; ...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
CREATE DATABASE db_storedproc; CREATE DATABASE db_storedproc;
CREATE DATABASE db_storedproc_1; CREATE DATABASE db_storedproc_1;
USE db_storedproc; USE db_storedproc;
create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1; engine = <engine_to_be_tested>;
create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2; create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
create table t3(f1 char(20),f2 char(20),f3 integer) engine = myisam; engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
USE db_storedproc_1; USE db_storedproc_1;
create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
USE db_storedproc; USE db_storedproc;
create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam; create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam; create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t9(f1 int, f2 char(25), f3 int) engine = myisam; create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10; engine = <engine_to_be_tested>;
create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
Section 3.1.3 - Syntax checks for the stored procedure-specific flow Section 3.1.3 - Syntax checks for the stored procedure-specific flow
control statements IF, CASE, LOOP, LEAVE, ITERATE, REPEAT, WHILE: control statements IF, CASE, LOOP, LEAVE, ITERATE, REPEAT, WHILE:
......
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
View file @ bc3b4a2c
...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1; ...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
CREATE DATABASE db_storedproc; CREATE DATABASE db_storedproc;
CREATE DATABASE db_storedproc_1; CREATE DATABASE db_storedproc_1;
USE db_storedproc; USE db_storedproc;
create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1; engine = <engine_to_be_tested>;
create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2; create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
create table t3(f1 char(20),f2 char(20),f3 integer) engine = myisam; engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
USE db_storedproc_1; USE db_storedproc_1;
create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
USE db_storedproc; USE db_storedproc;
create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam; create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam; create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t9(f1 int, f2 char(25), f3 int) engine = myisam; create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10; engine = <engine_to_be_tested>;
create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
Section 3.1.6 - Privilege Checks: Section 3.1.6 - Privilege Checks:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
View file @ bc3b4a2c
...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1; ...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
CREATE DATABASE db_storedproc; CREATE DATABASE db_storedproc;
CREATE DATABASE db_storedproc_1; CREATE DATABASE db_storedproc_1;
USE db_storedproc; USE db_storedproc;
create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1; engine = <engine_to_be_tested>;
create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2; create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
create table t3(f1 char(20),f2 char(20),f3 integer) engine = myisam; engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
USE db_storedproc_1; USE db_storedproc_1;
create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
USE db_storedproc; USE db_storedproc;
create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam; create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam; create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t9(f1 int, f2 char(25), f3 int) engine = myisam; create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10; engine = <engine_to_be_tested>;
create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
Section 3.1.7 - SQL mode checks: Section 3.1.7 - SQL mode checks:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
View file @ bc3b4a2c
...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1; ...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
CREATE DATABASE db_storedproc; CREATE DATABASE db_storedproc;
CREATE DATABASE db_storedproc_1; CREATE DATABASE db_storedproc_1;
USE db_storedproc; USE db_storedproc;
create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1; engine = <engine_to_be_tested>;
create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2; create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
create table t3(f1 char(20),f2 char(20),f3 integer) engine = myisam; engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
USE db_storedproc_1; USE db_storedproc_1;
create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
USE db_storedproc; USE db_storedproc;
create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam; create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam; create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t9(f1 int, f2 char(25), f3 int) engine = myisam; create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10; engine = <engine_to_be_tested>;
create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
Section 3.1.8 - SHOW statement checks: Section 3.1.8 - SHOW statement checks:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
View file @ bc3b4a2c
...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1; ...@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
CREATE DATABASE db_storedproc; CREATE DATABASE db_storedproc;
CREATE DATABASE db_storedproc_1; CREATE DATABASE db_storedproc_1;
USE db_storedproc; USE db_storedproc;
create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1; engine = <engine_to_be_tested>;
create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2; create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
create table t3(f1 char(20),f2 char(20),f3 integer) engine = myisam; engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
USE db_storedproc_1; USE db_storedproc_1;
create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
USE db_storedproc; USE db_storedproc;
create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam; create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -34,8 +39,9 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam; create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8; engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
Warnings: Warnings:
Warning 1265 Data truncated for column 'f3' at row 1 Warning 1265 Data truncated for column 'f3' at row 1
Warning 1265 Data truncated for column 'f3' at row 2 Warning 1265 Data truncated for column 'f3' at row 2
...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7 ...@@ -47,12 +53,14 @@ Warning 1265 Data truncated for column 'f3' at row 7
Warning 1265 Data truncated for column 'f3' at row 8 Warning 1265 Data truncated for column 'f3' at row 8
Warning 1265 Data truncated for column 'f3' at row 9 Warning 1265 Data truncated for column 'f3' at row 9
Warning 1265 Data truncated for column 'f3' at row 10 Warning 1265 Data truncated for column 'f3' at row 10
create table t9(f1 int, f2 char(25), f3 int) engine = myisam; create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10; engine = <engine_to_be_tested>;
create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
engine = <engine_to_be_tested>;
load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
Section 3.1.10 - CALL checks: Section 3.1.10 - CALL checks:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
mysql-test/suite/funcs_1/r/myisam_trig_0102.result
View file @ bc3b4a2c
...@@ -64,7 +64,8 @@ Warnings: ...@@ -64,7 +64,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
into table tb3;
Testcase: 3.5.1.1: Testcase: 3.5.1.1:
------------------ ------------------
......
mysql-test/suite/funcs_1/r/myisam_trig_03.result
View file @ bc3b4a2c
...@@ -64,7 +64,8 @@ Warnings: ...@@ -64,7 +64,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
into table tb3;
Testcase 3.5.3: Testcase 3.5.3:
--------------- ---------------
...@@ -103,7 +104,7 @@ test_noprivs@localhost ...@@ -103,7 +104,7 @@ test_noprivs@localhost
use priv_db; use priv_db;
create trigger trg1_1 before INSERT on t1 for each row create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig 3.5.3.2_1-no'; set new.f1 = 'trig 3.5.3.2_1-no';
Got one of the listed errors ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
use priv_db; use priv_db;
insert into t1 (f1) values ('insert 3.5.3.2-no'); insert into t1 (f1) values ('insert 3.5.3.2-no');
select f1 from t1 order by f1; select f1 from t1 order by f1;
...@@ -135,7 +136,7 @@ Testcase 3.5.3.6: ...@@ -135,7 +136,7 @@ Testcase 3.5.3.6:
----------------- -----------------
use priv_db; use priv_db;
drop trigger trg1_2; drop trigger trg1_2;
Got one of the listed errors ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
use priv_db; use priv_db;
insert into t1 (f1) values ('insert 3.5.3.6-yes'); insert into t1 (f1) values ('insert 3.5.3.6-yes');
select f1 from t1 order by f1; select f1 from t1 order by f1;
......
mysql-test/suite/funcs_1/r/myisam_trig_03e.result
View file @ bc3b4a2c
...@@ -1214,7 +1214,7 @@ create definer=not_ex_user@localhost trigger trg1_0 ...@@ -1214,7 +1214,7 @@ create definer=not_ex_user@localhost trigger trg1_0
before INSERT on t1 for each row before INSERT on t1 for each row
set new.f1 = 'trig 1_0-yes'; set new.f1 = 'trig 1_0-yes';
Warnings: Warnings:
Note 1449 There is no 'not_ex_user'@'localhost' registered Note 1449 The user specified as a definer ('not_ex_user'@'localhost') does not exist
drop trigger trg1_0; drop trigger trg1_0;
create definer=test_yesprivs@localhost trigger trg1_0 create definer=test_yesprivs@localhost trigger trg1_0
before INSERT on t1 for each row before INSERT on t1 for each row
......
mysql-test/suite/funcs_1/r/myisam_trig_0407.result
View file @ bc3b4a2c
...@@ -64,7 +64,8 @@ Warnings: ...@@ -64,7 +64,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
into table tb3;
Testcase: 3.5: Testcase: 3.5:
-------------- --------------
......
mysql-test/suite/funcs_1/r/myisam_trig_08.result
View file @ bc3b4a2c
...@@ -64,7 +64,8 @@ Warnings: ...@@ -64,7 +64,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
into table tb3;
Testcase: 3.5: Testcase: 3.5:
-------------- --------------
......
mysql-test/suite/funcs_1/r/myisam_trig_09.result
View file @ bc3b4a2c
...@@ -64,7 +64,8 @@ Warnings: ...@@ -64,7 +64,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
into table tb3;
Testcase 3.5.9.1/2: Testcase 3.5.9.1/2:
------------------- -------------------
...@@ -241,6 +242,7 @@ ERROR HY000: There is no NEW row in on DELETE trigger ...@@ -241,6 +242,7 @@ ERROR HY000: There is no NEW row in on DELETE trigger
create trigger trg5b after DELETE on tb3 for each row create trigger trg5b after DELETE on tb3 for each row
set new.f122='test'; set new.f122='test';
ERROR HY000: There is no NEW row in on DELETE trigger ERROR HY000: There is no NEW row in on DELETE trigger
drop trigger trg5a;
drop trigger trg5b; drop trigger trg5b;
Testcase 3.5.9.10: (implied in previous tests) Testcase 3.5.9.10: (implied in previous tests)
......
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
View file @ bc3b4a2c
...@@ -64,7 +64,8 @@ Warnings: ...@@ -64,7 +64,8 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
into table tb3;
Testcase 3.5.10.1/2/3: Testcase 3.5.10.1/2/3:
---------------------- ----------------------
...@@ -141,7 +142,7 @@ set @counter= 0; ...@@ -141,7 +142,7 @@ set @counter= 0;
select @counter as 'Rows Loaded Before'; select @counter as 'Rows Loaded Before';
Rows Loaded Before Rows Loaded Before
0 0
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load; load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table tb_load;
select @counter as 'Rows Loaded After'; select @counter as 'Rows Loaded After';
Rows Loaded After Rows Loaded After
10 10
......
mysql-test/suite/funcs_1/r/ndb_views.result
View file @ bc3b4a2c
This diff is collapsed.
mysql-test/suite/funcs_1/t/suite.opt
View file @ bc3b4a2c
This diff is collapsed.
mysql-test/suite/funcs_1/triggers/triggers_master.test deleted 100644 → 0
View file @ e39ceb99
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7