Skip to content

M
mariadb
Commit b7360593 authored by joerg@trift-lap.fambruehe's avatar joerg@trift-lap.fambruehe
Browse files
Options

Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 

into  trift-lap.fambruehe:/MySQL/M51/push-5.1
parents 013fd236 be2080f9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8297 additions and 10052 deletions
client/mysqlbinlog.cc
View file @ b7360593
...@@ -1926,7 +1926,7 @@ int main(int argc, char** argv) ...@@ -1926,7 +1926,7 @@ int main(int argc, char** argv)
DBUG_ENTER("main"); DBUG_ENTER("main");
DBUG_PROCESS(argv[0]); DBUG_PROCESS(argv[0]);
init_time(); // for time functions my_init_time(); // for time functions
parse_args(&argc, (char***)&argv); parse_args(&argc, (char***)&argv);
defaults_argv=argv; defaults_argv=argv;
......
include/my_time.h
View file @ b7360593
...@@ -95,7 +95,7 @@ long calc_daynr(uint year,uint month,uint day); ...@@ -95,7 +95,7 @@ long calc_daynr(uint year,uint month,uint day);
uint calc_days_in_year(uint year); uint calc_days_in_year(uint year);
uint year_2000_handling(uint year); uint year_2000_handling(uint year);
void init_time(void); void my_init_time(void);
/* /*
......
mysql-test/Makefile.am
View file @ b7360593
...@@ -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)/std_data/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)/std_data/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/r/type_blob.result
View file @ b7360593
...@@ -821,4 +821,152 @@ LENGTH(c) CHAR_LENGTH(c) ...@@ -821,4 +821,152 @@ LENGTH(c) CHAR_LENGTH(c)
65535 65535 65535 65535
65535 65535 65535 65535
DROP TABLE t; DROP TABLE t;
drop table if exists b15776;
create table b15776 (data blob(2147483647));
drop table b15776;
create table b15776 (data blob(-1));
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1))' at line 1
create table b15776 (data blob(2147483648));
drop table b15776;
create table b15776 (data blob(4294967294));
drop table b15776;
create table b15776 (data blob(4294967295));
drop table b15776;
create table b15776 (data blob(4294967296));
ERROR 42000: Display width out of range for column 'data' (max = 4294967295)
CREATE TABLE b15776 (a blob(2147483647), b blob(2147483648), c blob(4294967295), a1 text(2147483647), b1 text(2147483648), c1 text(4294967295) );
show columns from b15776;
Field Type Null Key Default Extra
a longblob YES NULL
b longblob YES NULL
c longblob YES NULL
a1 longtext YES NULL
b1 longtext YES NULL
c1 longtext YES NULL
drop table b15776;
CREATE TABLE b15776 (a blob(4294967296));
ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
CREATE TABLE b15776 (a text(4294967296));
ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
CREATE TABLE b15776 (a blob(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
CREATE TABLE b15776 (a text(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
CREATE TABLE b15776 (a int(0));
INSERT INTO b15776 values (NULL), (1), (42), (654);
SELECT * from b15776 ORDER BY a;
a
NULL
1
42
654
DROP TABLE b15776;
CREATE TABLE b15776 (a int(-1));
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1))' at line 1
CREATE TABLE b15776 (a int(255));
DROP TABLE b15776;
CREATE TABLE b15776 (a int(256));
ERROR 42000: Display width out of range for column 'a' (max = 255)
CREATE TABLE b15776 (data blob(-1));
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1))' at line 1
CREATE TABLE b15776 (a char(2147483647));
ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT instead
CREATE TABLE b15776 (a char(2147483648));
ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT instead
CREATE TABLE b15776 (a char(4294967295));
ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT instead
CREATE TABLE b15776 (a char(4294967296));
ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
CREATE TABLE b15776 (a year(4294967295));
INSERT INTO b15776 VALUES (42);
SELECT * FROM b15776;
a
2042
DROP TABLE b15776;
CREATE TABLE b15776 (a year(4294967296));
ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
CREATE TABLE b15776 (a year(0));
DROP TABLE b15776;
CREATE TABLE b15776 (a year(-2));
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-2))' at line 1
CREATE TABLE b15776 (a timestamp(4294967294));
Warnings:
Warning 1287 The syntax 'TIMESTAMP(4294967294)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead
DROP TABLE b15776;
CREATE TABLE b15776 (a timestamp(4294967295));
ERROR 42000: Display width out of range for column 'a' (max = 255)
CREATE TABLE b15776 (a timestamp(4294967296));
ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
CREATE TABLE b15776 (a timestamp(-2));
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-2))' at line 1
CREATE TABLE b15776 (a int(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
CREATE TABLE b15776 (a char(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
CREATE TABLE b15776 (a year(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
CREATE TABLE b15776 (a timestamp(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
CREATE TABLE b15776 select cast(null as char(4294967295));
show columns from b15776;
Field Type Null Key Default Extra
cast(null as char(4294967295)) char(0) YES NULL
drop table b15776;
CREATE TABLE b15776 select cast(null as nchar(4294967295));
show columns from b15776;
Field Type Null Key Default Extra
cast(null as nchar(4294967295)) char(0) YES NULL
drop table b15776;
CREATE TABLE b15776 select cast(null as binary(4294967295));
show columns from b15776;
Field Type Null Key Default Extra
cast(null as binary(4294967295)) binary(0) YES NULL
drop table b15776;
explain select cast(1 as char(4294967295));
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used
explain select cast(1 as nchar(4294967295));
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used
explain select cast(1 as binary(4294967295));
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used
explain select cast(1 as char(4294967296));
ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
explain select cast(1 as nchar(4294967296));
ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
explain select cast(1 as binary(4294967296));
ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
explain select cast(1 as decimal(-1));
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1))' at line 1
explain select cast(1 as decimal(64, 30));
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used
explain select cast(1 as decimal(64, 999999999999999999999999999999));
Got one of the listed errors
explain select cast(1 as decimal(4294967296));
Got one of the listed errors
explain select cast(1 as decimal(999999999999999999999999999999999999));
Got one of the listed errors
explain select convert(1, char(4294967295));
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used
explain select convert(1, char(4294967296));
ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
explain select convert(1, char(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
explain select convert(1, nchar(4294967295));
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used
explain select convert(1, nchar(4294967296));
ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
explain select convert(1, nchar(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
explain select convert(1, binary(4294967295));
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used
explain select convert(1, binary(4294967296));
ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
explain select convert(1, binary(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
End of 5.0 tests End of 5.0 tests
mysql-test/std_data/funcs_1/load_file.txt 0 → 100644
View file @ b7360593
Here is content from load_file
mysql-test/suite/funcs_1/README.txt
View file @ b7360593
...@@ -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/datadict/datadict_bug_12777.inc
View file @ b7360593
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# columns in INFORMATION_SCHEMA with VARCHAR(4096) on Linux and Intel or AMD # columns in INFORMATION_SCHEMA with VARCHAR(4096) on Linux and Intel or AMD
# processor are shown as VARCHAR(512) on Windows, VARCHAR(1023) on AIX and HPUX, # processor are shown as VARCHAR(512) on Windows, VARCHAR(1023) on AIX and HPUX,
# VARCHAR(1024) on Solaris10, ... see below and in bug #12777 for details. # VARCHAR(1024) on Solaris10, ... see below and in bug #12777 for details.
# So we need to replace the output for these systems. There may be other still # So we need to replace the output for these systems. There may be other still
# not tested / detected systems. # not tested / detected systems.
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
# Setting the variables used below has been moved to the beginning of the datadict # Setting the variables used below has been moved to the beginning of the datadict
# tests to "suite/funcs_1/datadict/datadict_load.inc". # tests to "suite/funcs_1/datadict/datadict_load.inc".
# #
# SELECT character_maximum_length INTO @CML # SELECT character_maximum_length INTO @CML
# FROM information_schema.columns # FROM information_schema.columns
# WHERE table_schema = 'information_schema' # WHERE table_schema = 'information_schema'
# AND table_name = 'columns' # AND table_name = 'columns'
# AND column_name = 'table_catalog'; # AND column_name = 'table_catalog';
# this enables the --replace_result only if needed, using this we never replace # this enables the --replace_result only if needed, using this we never replace
...@@ -31,7 +31,7 @@ if ($bug_12777_0512) ...@@ -31,7 +31,7 @@ if ($bug_12777_0512)
--replace_result 512 4096 1536 12288 --replace_result 512 4096 1536 12288
} }
# aix52, aix52-64bit, hp3750, hp3750-64bit, hpux11, hpux11-64bit, # aix52, aix52-64bit, hp3750, hp3750-64bit, hpux11, hpux11-64bit,
if ($bug_12777_1023) if ($bug_12777_1023)
{ {
# nnnn 3*n # nnnn 3*n
......
mysql-test/suite/funcs_1/datadict/datadict_load.inc
View file @ b7360593
...@@ -12,14 +12,14 @@ ...@@ -12,14 +12,14 @@
--disable_query_log --disable_query_log
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Get the size of ONE known colum and check the size against some values to # Get the size of ONE known colum and check the size against some values to
# be able to use the correct --replace_result statement. Using this only the # be able to use the correct --replace_result statement. Using this only the
# one pair of 'wrong' values is replaced and not all occurrencies of all # one pair of 'wrong' values is replaced and not all occurrencies of all
# possible pairs of values. See bug #12777 for details. # possible pairs of values. See bug #12777 for details.
SELECT character_maximum_length INTO @CML SELECT character_maximum_length INTO @CML
FROM information_schema.columns FROM information_schema.columns
WHERE table_schema = 'information_schema' WHERE table_schema = 'information_schema'
AND table_name = 'columns' AND table_name = 'columns'
AND column_name = 'table_catalog'; AND column_name = 'table_catalog';
let $bug_12777_0512= `SELECT @CML = 512`; let $bug_12777_0512= `SELECT @CML = 512`;
...@@ -53,7 +53,7 @@ let $SERVER_NAME= `SELECT DISTINCT host FROM mysql.user WHERE host NOT In ("loca ...@@ -53,7 +53,7 @@ let $SERVER_NAME= `SELECT DISTINCT host FROM mysql.user WHERE host NOT In ("loca
# load tables # load tables
# ----------- # -----------
# #
# this was part of the 4 files $<engine>_datadict.test, but it has been moved # this was part of the 4 files $<engine>_datadict.test, but it has been moved
# here to have only one place where all preparation for the test is done. # here to have only one place where all preparation for the test is done.
# #
################################################################################ ################################################################################
......
mysql-test/suite/funcs_1/datadict/processlist_val.inc
View file @ b7360593
...@@ -123,7 +123,7 @@ let $wait_timeout= 4; ...@@ -123,7 +123,7 @@ let $wait_timeout= 4;
let $wait_condition= SELECT id,user,host,db,command,@time2:=time,state,info FROM INFORMATION_SCHEMA.PROCESSLIST let $wait_condition= SELECT id,user,host,db,command,@time2:=time,state,info FROM INFORMATION_SCHEMA.PROCESSLIST
WHERE TIME > @time; WHERE TIME > @time;
--source include/wait_condition.inc --source include/wait_condition.inc
# #
# Expect to hit TIME > @time # Expect to hit TIME > @time
SELECT @time < @time2; SELECT @time < @time2;
# #
......
mysql-test/suite/funcs_1/include/innodb_tb1.inc
View file @ b7360593
...@@ -4,66 +4,67 @@ ...@@ -4,66 +4,67 @@
drop table if exists tb1 ; drop table if exists tb1 ;
--enable_warnings --enable_warnings
create table tb1 ( create table tb1 (
f1 char(0), f1 char(0),
f2 char(0) binary, f2 char(0) binary,
f3 char(0) ascii, f3 char(0) ascii,
f4 tinytext unicode, f4 tinytext unicode,
f5 text, f5 text,
f6 mediumtext, f6 mediumtext,
f7 longtext, f7 longtext,
f8 tinyblob, f8 tinyblob,
f9 blob, f9 blob,
f10 mediumblob, f10 mediumblob,
f11 longblob, f11 longblob,
f12 binary, f12 binary,
f13 tinyint, f13 tinyint,
f14 tinyint unsigned, f14 tinyint unsigned,
f15 tinyint zerofill, f15 tinyint zerofill,
f16 tinyint unsigned zerofill, f16 tinyint unsigned zerofill,
f17 smallint, f17 smallint,
f18 smallint unsigned, f18 smallint unsigned,
f19 smallint zerofill, f19 smallint zerofill,
f20 smallint unsigned zerofill, f20 smallint unsigned zerofill,
f21 mediumint, f21 mediumint,
f22 mediumint unsigned, f22 mediumint unsigned,
f23 mediumint zerofill, f23 mediumint zerofill,
f24 mediumint unsigned zerofill, f24 mediumint unsigned zerofill,
f25 int, f25 int,
f26 int unsigned, f26 int unsigned,
f27 int zerofill, f27 int zerofill,
f28 int unsigned zerofill, f28 int unsigned zerofill,
f29 bigint, f29 bigint,
f30 bigint unsigned, f30 bigint unsigned,
f31 bigint zerofill, f31 bigint zerofill,
f32 bigint unsigned zerofill, f32 bigint unsigned zerofill,
f33 decimal, f33 decimal,
f34 decimal unsigned, f34 decimal unsigned,
f35 decimal zerofill, f35 decimal zerofill,
f36 decimal unsigned zerofill not null DEFAULT 9.9, f36 decimal unsigned zerofill not null DEFAULT 9.9,
f37 decimal (0) not null DEFAULT 9.9, f37 decimal (0) not null DEFAULT 9.9,
f38 decimal (64) not null DEFAULT 9.9, f38 decimal (64) not null DEFAULT 9.9,
f39 decimal (0) unsigned not null DEFAULT 9.9, f39 decimal (0) unsigned not null DEFAULT 9.9,
f40 decimal (64) unsigned not null DEFAULT 9.9, f40 decimal (64) unsigned not null DEFAULT 9.9,
f41 decimal (0) zerofill not null DEFAULT 9.9, f41 decimal (0) zerofill not null DEFAULT 9.9,
f42 decimal (64) zerofill not null DEFAULT 9.9, f42 decimal (64) zerofill not null DEFAULT 9.9,
f43 decimal (0) unsigned zerofill not null DEFAULT 9.9, f43 decimal (0) unsigned zerofill not null DEFAULT 9.9,
f44 decimal (64) unsigned zerofill not null DEFAULT 9.9, f44 decimal (64) unsigned zerofill not null DEFAULT 9.9,
f45 decimal (0,0) not null DEFAULT 9.9, f45 decimal (0,0) not null DEFAULT 9.9,
f46 decimal (63,30) not null DEFAULT 9.9, f46 decimal (63,30) not null DEFAULT 9.9,
f47 decimal (0,0) unsigned not null DEFAULT 9.9, f47 decimal (0,0) unsigned not null DEFAULT 9.9,
f48 decimal (63,30) unsigned not null DEFAULT 9.9, f48 decimal (63,30) unsigned not null DEFAULT 9.9,
f49 decimal (0,0) zerofill not null DEFAULT 9.9, f49 decimal (0,0) zerofill not null DEFAULT 9.9,
f50 decimal (63,30) zerofill not null DEFAULT 9.9, f50 decimal (63,30) zerofill not null DEFAULT 9.9,
f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9, f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9,
f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9, f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9,
f53 numeric not null DEFAULT 99, f53 numeric not null DEFAULT 99,
f54 numeric unsigned not null DEFAULT 99, f54 numeric unsigned not null DEFAULT 99,
f55 numeric zerofill not null DEFAULT 99, f55 numeric zerofill not null DEFAULT 99,
f56 numeric unsigned zerofill not null DEFAULT 99, f56 numeric unsigned zerofill not null DEFAULT 99,
f57 numeric (0) not null DEFAULT 99, 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 @ b7360593
...@@ -4,58 +4,60 @@ ...@@ -4,58 +4,60 @@
drop table if exists tb2 ; drop table if exists tb2 ;
--enable_warnings --enable_warnings
create table tb2 ( create table tb2 (
f59 numeric (0) unsigned, f59 numeric (0) unsigned,
f60 numeric (64) unsigned, f60 numeric (64) unsigned,
f61 numeric (0) zerofill, f61 numeric (0) zerofill,
f62 numeric (64) zerofill, f62 numeric (64) zerofill,
f63 numeric (0) unsigned zerofill, f63 numeric (0) unsigned zerofill,
f64 numeric (64) unsigned zerofill, f64 numeric (64) unsigned zerofill,
f65 numeric (0,0), f65 numeric (0,0),
f66 numeric (63,30), f66 numeric (63,30),
f67 numeric (0,0) unsigned, f67 numeric (0,0) unsigned,
f68 numeric (63,30) unsigned, f68 numeric (63,30) unsigned,
f69 numeric (0,0) zerofill, f69 numeric (0,0) zerofill,
f70 numeric (63,30) zerofill, f70 numeric (63,30) zerofill,
f71 numeric (0,0) unsigned zerofill, f71 numeric (0,0) unsigned zerofill,
f72 numeric (63,30) unsigned zerofill, f72 numeric (63,30) unsigned zerofill,
f73 real, f73 real,
f74 real unsigned, f74 real unsigned,
f75 real zerofill, f75 real zerofill,
f76 real unsigned zerofill, f76 real unsigned zerofill,
f77 double default 7.7, f77 double default 7.7,
f78 double unsigned default 7.7, f78 double unsigned default 7.7,
f79 double zerofill default 7.7, f79 double zerofill default 7.7,
f80 double unsigned zerofill default 8.8, f80 double unsigned zerofill default 8.8,
f81 float not null default 8.8, f81 float not null default 8.8,
f82 float unsigned not null default 8.8, f82 float unsigned not null default 8.8,
f83 float zerofill not null default 8.8, f83 float zerofill not null default 8.8,
f84 float unsigned zerofill not null default 8.8, f84 float unsigned zerofill not null default 8.8,
f85 float(0) not null default 8.8, f85 float(0) not null default 8.8,
f86 float(23) not null default 8.8, f86 float(23) not null default 8.8,
f87 float(0) unsigned not null default 8.8, f87 float(0) unsigned not null default 8.8,
f88 float(23) unsigned not null default 8.8, f88 float(23) unsigned not null default 8.8,
f89 float(0) zerofill not null default 8.8, f89 float(0) zerofill not null default 8.8,
f90 float(23) zerofill not null default 8.8, f90 float(23) zerofill not null default 8.8,
f91 float(0) unsigned zerofill not null default 8.8, f91 float(0) unsigned zerofill not null default 8.8,
f92 float(23) unsigned zerofill not null default 8.8, f92 float(23) unsigned zerofill not null default 8.8,
f93 float(24) not null default 8.8, f93 float(24) not null default 8.8,
f94 float(53) not null default 8.8, f94 float(53) not null default 8.8,
f95 float(24) unsigned not null default 8.8, f95 float(24) unsigned not null default 8.8,
f96 float(53) unsigned not null default 8.8, f96 float(53) unsigned not null default 8.8,
f97 float(24) zerofill not null default 8.8, f97 float(24) zerofill not null default 8.8,
f98 float(53) zerofill not null default 8.8, f98 float(53) zerofill not null default 8.8,
f99 float(24) unsigned zerofill not null default 8.8, f99 float(24) unsigned zerofill not null default 8.8,
f100 float(53) unsigned zerofill not null default 8.8, f100 float(53) unsigned zerofill not null default 8.8,
f101 date not null default '2000-01-01', f101 date not null default '2000-01-01',
f102 time not null default 20, f102 time not null default 20,
f103 datetime not null default '2/2/2', f103 datetime not null default '2/2/2',
f104 timestamp not null default 20001231235959, f104 timestamp not null default 20001231235959,
f105 year not null default 2000, f105 year not null default 2000,
f106 year(3) not null default 2000, f106 year(3) not null default 2000,
f107 year(4) not null default 2000, 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;
--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 @ b7360593
...@@ -4,65 +4,67 @@ ...@@ -4,65 +4,67 @@
drop table if exists tb3 ; drop table if exists tb3 ;
--enable_warnings --enable_warnings
create table tb3 ( create table tb3 (
f118 char not null DEFAULT 'a', f118 char not null DEFAULT 'a',
f119 char binary not null DEFAULT b'101', f119 char binary not null DEFAULT b'101',
f120 char ascii not null DEFAULT b'101', f120 char ascii not null DEFAULT b'101',
f121 tinytext, f121 tinytext,
f122 text, f122 text,
f123 mediumtext, f123 mediumtext,
f124 longtext unicode, f124 longtext unicode,
f125 tinyblob, f125 tinyblob,
f126 blob, f126 blob,
f127 mediumblob, f127 mediumblob,
f128 longblob, f128 longblob,
f129 binary not null DEFAULT b'101', f129 binary not null DEFAULT b'101',
f130 tinyint not null DEFAULT 99, f130 tinyint not null DEFAULT 99,
f131 tinyint unsigned not null DEFAULT 99, f131 tinyint unsigned not null DEFAULT 99,
f132 tinyint zerofill not null DEFAULT 99, f132 tinyint zerofill not null DEFAULT 99,
f133 tinyint unsigned zerofill not null DEFAULT 99, f133 tinyint unsigned zerofill not null DEFAULT 99,
f134 smallint not null DEFAULT 999, f134 smallint not null DEFAULT 999,
f135 smallint unsigned not null DEFAULT 999, f135 smallint unsigned not null DEFAULT 999,
f136 smallint zerofill not null DEFAULT 999, f136 smallint zerofill not null DEFAULT 999,
f137 smallint unsigned zerofill not null DEFAULT 999, f137 smallint unsigned zerofill not null DEFAULT 999,
f138 mediumint not null DEFAULT 9999, f138 mediumint not null DEFAULT 9999,
f139 mediumint unsigned not null DEFAULT 9999, f139 mediumint unsigned not null DEFAULT 9999,
f140 mediumint zerofill not null DEFAULT 9999, f140 mediumint zerofill not null DEFAULT 9999,
f141 mediumint unsigned zerofill not null DEFAULT 9999, f141 mediumint unsigned zerofill not null DEFAULT 9999,
f142 int not null DEFAULT 99999, f142 int not null DEFAULT 99999,
f143 int unsigned not null DEFAULT 99999, f143 int unsigned not null DEFAULT 99999,
f144 int zerofill not null DEFAULT 99999, f144 int zerofill not null DEFAULT 99999,
f145 int unsigned zerofill not null DEFAULT 99999, f145 int unsigned zerofill not null DEFAULT 99999,
f146 bigint not null DEFAULT 999999, f146 bigint not null DEFAULT 999999,
f147 bigint unsigned not null DEFAULT 999999, f147 bigint unsigned not null DEFAULT 999999,
f148 bigint zerofill not null DEFAULT 999999, f148 bigint zerofill not null DEFAULT 999999,
f149 bigint unsigned zerofill not null DEFAULT 999999, f149 bigint unsigned zerofill not null DEFAULT 999999,
f150 decimal not null DEFAULT 999.999, f150 decimal not null DEFAULT 999.999,
f151 decimal unsigned not null DEFAULT 999.17, f151 decimal unsigned not null DEFAULT 999.17,
f152 decimal zerofill not null DEFAULT 999.999, f152 decimal zerofill not null DEFAULT 999.999,
f153 decimal unsigned zerofill, f153 decimal unsigned zerofill,
f154 decimal (0), f154 decimal (0),
f155 decimal (64), f155 decimal (64),
f156 decimal (0) unsigned, f156 decimal (0) unsigned,
f157 decimal (64) unsigned, f157 decimal (64) unsigned,
f158 decimal (0) zerofill, f158 decimal (0) zerofill,
f159 decimal (64) zerofill, f159 decimal (64) zerofill,
f160 decimal (0) unsigned zerofill, f160 decimal (0) unsigned zerofill,
f161 decimal (64) unsigned zerofill, f161 decimal (64) unsigned zerofill,
f162 decimal (0,0), f162 decimal (0,0),
f163 decimal (63,30), f163 decimal (63,30),
f164 decimal (0,0) unsigned, f164 decimal (0,0) unsigned,
f165 decimal (63,30) unsigned, f165 decimal (63,30) unsigned,
f166 decimal (0,0) zerofill, f166 decimal (0,0) zerofill,
f167 decimal (63,30) zerofill, f167 decimal (63,30) zerofill,
f168 decimal (0,0) unsigned zerofill, f168 decimal (0,0) unsigned zerofill,
f169 decimal (63,30) unsigned zerofill, f169 decimal (63,30) unsigned zerofill,
f170 numeric, f170 numeric,
f171 numeric unsigned, f171 numeric unsigned,
f172 numeric zerofill, f172 numeric zerofill,
f173 numeric unsigned zerofill, f173 numeric unsigned zerofill,
f174 numeric (0), 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 @ b7360593
...@@ -4,56 +4,56 @@ ...@@ -4,56 +4,56 @@
drop table if exists tb4; drop table if exists tb4;
--enable_warnings --enable_warnings
create table tb4 ( create table tb4 (
f176 numeric (0) unsigned not null DEFAULT 9, f176 numeric (0) unsigned not null DEFAULT 9,
f177 numeric (64) unsigned not null DEFAULT 9, f177 numeric (64) unsigned not null DEFAULT 9,
f178 numeric (0) zerofill not null DEFAULT 9, f178 numeric (0) zerofill not null DEFAULT 9,
f179 numeric (64) zerofill not null DEFAULT 9, f179 numeric (64) zerofill not null DEFAULT 9,
f180 numeric (0) unsigned zerofill not null DEFAULT 9, f180 numeric (0) unsigned zerofill not null DEFAULT 9,
f181 numeric (64) unsigned zerofill not null DEFAULT 9, f181 numeric (64) unsigned zerofill not null DEFAULT 9,
f182 numeric (0,0) not null DEFAULT 9, f182 numeric (0,0) not null DEFAULT 9,
f183 numeric (63,30) not null DEFAULT 9, f183 numeric (63,30) not null DEFAULT 9,
f184 numeric (0,0) unsigned not null DEFAULT 9, f184 numeric (0,0) unsigned not null DEFAULT 9,
f185 numeric (63,30) unsigned not null DEFAULT 9, f185 numeric (63,30) unsigned not null DEFAULT 9,
f186 numeric (0,0) zerofill not null DEFAULT 9, f186 numeric (0,0) zerofill not null DEFAULT 9,
f187 numeric (63,30) zerofill not null DEFAULT 9, f187 numeric (63,30) zerofill not null DEFAULT 9,
f188 numeric (0,0) unsigned zerofill not null DEFAULT 9, f188 numeric (0,0) unsigned zerofill not null DEFAULT 9,
f189 numeric (63,30) unsigned zerofill not null DEFAULT 9, f189 numeric (63,30) unsigned zerofill not null DEFAULT 9,
f190 real not null DEFAULT 88.8, f190 real not null DEFAULT 88.8,
f191 real unsigned not null DEFAULT 88.8, f191 real unsigned not null DEFAULT 88.8,
f192 real zerofill not null DEFAULT 88.8, f192 real zerofill not null DEFAULT 88.8,
f193 real unsigned zerofill not null DEFAULT 88.8, f193 real unsigned zerofill not null DEFAULT 88.8,
f194 double not null DEFAULT 55.5, f194 double not null DEFAULT 55.5,
f195 double unsigned not null DEFAULT 55.5, f195 double unsigned not null DEFAULT 55.5,
f196 double zerofill not null DEFAULT 55.5, f196 double zerofill not null DEFAULT 55.5,
f197 double unsigned zerofill not null DEFAULT 55.5, f197 double unsigned zerofill not null DEFAULT 55.5,
f198 float, f198 float,
f199 float unsigned, f199 float unsigned,
f200 float zerofill, f200 float zerofill,
f201 float unsigned zerofill, f201 float unsigned zerofill,
f202 float(0), f202 float(0),
f203 float(23), f203 float(23),
f204 float(0) unsigned, f204 float(0) unsigned,
f205 float(23) unsigned, f205 float(23) unsigned,
f206 float(0) zerofill, f206 float(0) zerofill,
f207 float(23) zerofill, f207 float(23) zerofill,
f208 float(0) unsigned zerofill, f208 float(0) unsigned zerofill,
f209 float(23) unsigned zerofill, f209 float(23) unsigned zerofill,
f210 float(24), f210 float(24),
f211 float(53), f211 float(53),
f212 float(24) unsigned, f212 float(24) unsigned,
f213 float(53) unsigned, f213 float(53) unsigned,
f214 float(24) zerofill, f214 float(24) zerofill,
f215 float(53) zerofill, f215 float(53) zerofill,
f216 float(24) unsigned zerofill, f216 float(24) unsigned zerofill,
f217 float(53) unsigned zerofill, f217 float(53) unsigned zerofill,
f218 date, f218 date,
f219 time, f219 time,
f220 datetime, f220 datetime,
f221 timestamp, f221 timestamp,
f222 year, f222 year,
f223 year(3), f223 year(3),
f224 year(4), f224 year(4),
f225 enum("1enum","2enum"), f225 enum("1enum","2enum"),
f226 set("1set","2set"), f226 set("1set","2set"),
f235 char(0) unicode, f235 char(0) unicode,
f236 char(90), f236 char(90),
...@@ -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 @ b7360593
...@@ -4,57 +4,59 @@ ...@@ -4,57 +4,59 @@
drop table if exists tb1 ; drop table if exists tb1 ;
--enable_warnings --enable_warnings
create table tb1 ( create table tb1 (
f1 char, f1 char,
f2 char binary, f2 char binary,
f3 char ascii, f3 char ascii,
f12 binary, f12 binary,
f13 tinyint, f13 tinyint,
f14 tinyint unsigned, f14 tinyint unsigned,
f15 tinyint zerofill, f15 tinyint zerofill,
f16 tinyint unsigned zerofill, f16 tinyint unsigned zerofill,
f17 smallint, f17 smallint,
f18 smallint unsigned, f18 smallint unsigned,
f19 smallint zerofill, f19 smallint zerofill,
f20 smallint unsigned zerofill, f20 smallint unsigned zerofill,
f21 mediumint, f21 mediumint,
f22 mediumint unsigned, f22 mediumint unsigned,
f23 mediumint zerofill, f23 mediumint zerofill,
f24 mediumint unsigned zerofill, f24 mediumint unsigned zerofill,
f25 int, f25 int,
f26 int unsigned, f26 int unsigned,
f27 int zerofill, f27 int zerofill,
f28 int unsigned zerofill, f28 int unsigned zerofill,
f29 bigint, f29 bigint,
f30 bigint unsigned, f30 bigint unsigned,
f31 bigint zerofill, f31 bigint zerofill,
f32 bigint unsigned zerofill, f32 bigint unsigned zerofill,
f33 decimal not null DEFAULT 9.9, f33 decimal not null DEFAULT 9.9,
f34 decimal unsigned not null DEFAULT 9.9, f34 decimal unsigned not null DEFAULT 9.9,
f35 decimal zerofill not null DEFAULT 9.9, f35 decimal zerofill not null DEFAULT 9.9,
f36 decimal unsigned zerofill not null DEFAULT 9.9, f36 decimal unsigned zerofill not null DEFAULT 9.9,
f37 decimal (0) not null DEFAULT 9.9, f37 decimal (0) not null DEFAULT 9.9,
f38 decimal (64) not null DEFAULT 9.9, f38 decimal (64) not null DEFAULT 9.9,
f39 decimal (0) unsigned not null DEFAULT 9.9, f39 decimal (0) unsigned not null DEFAULT 9.9,
f40 decimal (64) unsigned not null DEFAULT 9.9, f40 decimal (64) unsigned not null DEFAULT 9.9,
f41 decimal (0) zerofill not null DEFAULT 9.9, f41 decimal (0) zerofill not null DEFAULT 9.9,
f42 decimal (64) zerofill not null DEFAULT 9.9, f42 decimal (64) zerofill not null DEFAULT 9.9,
f43 decimal (0) unsigned zerofill not null DEFAULT 9.9, f43 decimal (0) unsigned zerofill not null DEFAULT 9.9,
f44 decimal (64) unsigned zerofill not null DEFAULT 9.9, f44 decimal (64) unsigned zerofill not null DEFAULT 9.9,
f45 decimal (0,0) not null DEFAULT 9.9, f45 decimal (0,0) not null DEFAULT 9.9,
f46 decimal (63,30) not null DEFAULT 9.9, f46 decimal (63,30) not null DEFAULT 9.9,
f47 decimal (0,0) unsigned not null DEFAULT 9.9, f47 decimal (0,0) unsigned not null DEFAULT 9.9,
f48 decimal (63,30) unsigned not null DEFAULT 9.9, f48 decimal (63,30) unsigned not null DEFAULT 9.9,
f49 decimal (0,0) zerofill not null DEFAULT 9.9, f49 decimal (0,0) zerofill not null DEFAULT 9.9,
f50 decimal (63,30) zerofill not null DEFAULT 9.9, f50 decimal (63,30) zerofill not null DEFAULT 9.9,
f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9, f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9,
f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9, f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9,
f53 numeric not null DEFAULT 99, f53 numeric not null DEFAULT 99,
f54 numeric unsigned not null DEFAULT 99, f54 numeric unsigned not null DEFAULT 99,
f55 numeric zerofill not null DEFAULT 99, f55 numeric zerofill not null DEFAULT 99,
f56 numeric unsigned zerofill not null DEFAULT 99, f56 numeric unsigned zerofill not null DEFAULT 99,
f57 numeric (0) not null DEFAULT 99, 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 @ b7360593
...@@ -4,58 +4,60 @@ ...@@ -4,58 +4,60 @@
drop table if exists tb2 ; drop table if exists tb2 ;
--enable_warnings --enable_warnings
create table tb2 ( create table tb2 (
f59 numeric (0) unsigned, f59 numeric (0) unsigned,
f60 numeric (64) unsigned, f60 numeric (64) unsigned,
f61 numeric (0) zerofill, f61 numeric (0) zerofill,
f62 numeric (64) zerofill, f62 numeric (64) zerofill,
f63 numeric (0) unsigned zerofill, f63 numeric (0) unsigned zerofill,
f64 numeric (64) unsigned zerofill, f64 numeric (64) unsigned zerofill,
f65 numeric (0,0), f65 numeric (0,0),
f66 numeric (63,30), f66 numeric (63,30),
f67 numeric (0,0) unsigned, f67 numeric (0,0) unsigned,
f68 numeric (63,30) unsigned, f68 numeric (63,30) unsigned,
f69 numeric (0,0) zerofill, f69 numeric (0,0) zerofill,
f70 numeric (63,30) zerofill, f70 numeric (63,30) zerofill,
f71 numeric (0,0) unsigned zerofill, f71 numeric (0,0) unsigned zerofill,
f72 numeric (63,30) unsigned zerofill, f72 numeric (63,30) unsigned zerofill,
f73 real, f73 real,
f74 real unsigned, f74 real unsigned,
f75 real zerofill, f75 real zerofill,
f76 real unsigned zerofill, f76 real unsigned zerofill,
f77 double default 7.7, f77 double default 7.7,
f78 double unsigned default 7.7, f78 double unsigned default 7.7,
f79 double zerofill default 7.7, f79 double zerofill default 7.7,
f80 double unsigned zerofill default 8.8, f80 double unsigned zerofill default 8.8,
f81 float not null default 8.8, f81 float not null default 8.8,
f82 float unsigned not null default 8.8, f82 float unsigned not null default 8.8,
f83 float zerofill not null default 8.8, f83 float zerofill not null default 8.8,
f84 float unsigned zerofill not null default 8.8, f84 float unsigned zerofill not null default 8.8,
f85 float(0) not null default 8.8, f85 float(0) not null default 8.8,
f86 float(23) not null default 8.8, f86 float(23) not null default 8.8,
f87 float(0) unsigned not null default 8.8, f87 float(0) unsigned not null default 8.8,
f88 float(23) unsigned not null default 8.8, f88 float(23) unsigned not null default 8.8,
f89 float(0) zerofill not null default 8.8, f89 float(0) zerofill not null default 8.8,
f90 float(23) zerofill not null default 8.8, f90 float(23) zerofill not null default 8.8,
f91 float(0) unsigned zerofill not null default 8.8, f91 float(0) unsigned zerofill not null default 8.8,
f92 float(23) unsigned zerofill not null default 8.8, f92 float(23) unsigned zerofill not null default 8.8,
f93 float(24) not null default 8.8, f93 float(24) not null default 8.8,
f94 float(53) not null default 8.8, f94 float(53) not null default 8.8,
f95 float(24) unsigned not null default 8.8, f95 float(24) unsigned not null default 8.8,
f96 float(53) unsigned not null default 8.8, f96 float(53) unsigned not null default 8.8,
f97 float(24) zerofill not null default 8.8, f97 float(24) zerofill not null default 8.8,
f98 float(53) zerofill not null default 8.8, f98 float(53) zerofill not null default 8.8,
f99 float(24) unsigned zerofill not null default 8.8, f99 float(24) unsigned zerofill not null default 8.8,
f100 float(53) unsigned zerofill not null default 8.8, f100 float(53) unsigned zerofill not null default 8.8,
f101 date not null default '2000-01-01', f101 date not null default '2000-01-01',
f102 time not null default 20, f102 time not null default 20,
f103 datetime not null default '2/2/2', f103 datetime not null default '2/2/2',
f104 timestamp not null default 20001231235959, f104 timestamp not null default 20001231235959,
f105 year not null default 2000, f105 year not null default 2000,
f106 year(3) not null default 2000, f106 year(3) not null default 2000,
f107 year(4) not null default 2000, 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;
--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 @ b7360593
...@@ -4,60 +4,61 @@ ...@@ -4,60 +4,61 @@
drop table if exists tb3; drop table if exists tb3;
--enable_warnings --enable_warnings
create table tb3 ( create table tb3 (
f118 char not null DEFAULT 'a', f118 char not null DEFAULT 'a',
f119 char binary not null DEFAULT b'101', f119 char binary not null DEFAULT b'101',
f120 char ascii not null DEFAULT b'101', f120 char ascii not null DEFAULT b'101',
f121 char(50), f121 char(50),
f122 char(50), f122 char(50),
f129 binary not null DEFAULT b'101', f129 binary not null DEFAULT b'101',
f130 tinyint not null DEFAULT 99, f130 tinyint not null DEFAULT 99,
f131 tinyint unsigned not null DEFAULT 99, f131 tinyint unsigned not null DEFAULT 99,
f132 tinyint zerofill not null DEFAULT 99, f132 tinyint zerofill not null DEFAULT 99,
f133 tinyint unsigned zerofill not null DEFAULT 99, f133 tinyint unsigned zerofill not null DEFAULT 99,
f134 smallint not null DEFAULT 999, f134 smallint not null DEFAULT 999,
f135 smallint unsigned not null DEFAULT 999, f135 smallint unsigned not null DEFAULT 999,
f136 smallint zerofill not null DEFAULT 999, f136 smallint zerofill not null DEFAULT 999,
f137 smallint unsigned zerofill not null DEFAULT 999, f137 smallint unsigned zerofill not null DEFAULT 999,
f138 mediumint not null DEFAULT 9999, f138 mediumint not null DEFAULT 9999,
f139 mediumint unsigned not null DEFAULT 9999, f139 mediumint unsigned not null DEFAULT 9999,
f140 mediumint zerofill not null DEFAULT 9999, f140 mediumint zerofill not null DEFAULT 9999,
f141 mediumint unsigned zerofill not null DEFAULT 9999, f141 mediumint unsigned zerofill not null DEFAULT 9999,
f142 int not null DEFAULT 99999, f142 int not null DEFAULT 99999,
f143 int unsigned not null DEFAULT 99999, f143 int unsigned not null DEFAULT 99999,
f144 int zerofill not null DEFAULT 99999, f144 int zerofill not null DEFAULT 99999,
f145 int unsigned zerofill not null DEFAULT 99999, f145 int unsigned zerofill not null DEFAULT 99999,
f146 bigint not null DEFAULT 999999, f146 bigint not null DEFAULT 999999,
f147 bigint unsigned not null DEFAULT 999999, f147 bigint unsigned not null DEFAULT 999999,
f148 bigint zerofill not null DEFAULT 999999, f148 bigint zerofill not null DEFAULT 999999,
f149 bigint unsigned zerofill not null DEFAULT 999999, f149 bigint unsigned zerofill not null DEFAULT 999999,
f150 decimal not null DEFAULT 999.999, f150 decimal not null DEFAULT 999.999,
f151 decimal unsigned not null DEFAULT 999.17, f151 decimal unsigned not null DEFAULT 999.17,
f152 decimal zerofill not null DEFAULT 999.999, f152 decimal zerofill not null DEFAULT 999.999,
f153 decimal unsigned zerofill, f153 decimal unsigned zerofill,
f154 decimal (0), f154 decimal (0),
f155 decimal (64), f155 decimal (64),
f156 decimal (0) unsigned, f156 decimal (0) unsigned,
f157 decimal (64) unsigned, f157 decimal (64) unsigned,
f158 decimal (0) zerofill, f158 decimal (0) zerofill,
f159 decimal (64) zerofill, f159 decimal (64) zerofill,
f160 decimal (0) unsigned zerofill, f160 decimal (0) unsigned zerofill,
f161 decimal (64) unsigned zerofill, f161 decimal (64) unsigned zerofill,
f162 decimal (0,0), f162 decimal (0,0),
f163 decimal (63,30), f163 decimal (63,30),
f164 decimal (0,0) unsigned, f164 decimal (0,0) unsigned,
f165 decimal (63,30) unsigned, f165 decimal (63,30) unsigned,
f166 decimal (0,0) zerofill, f166 decimal (0,0) zerofill,
f167 decimal (63,30) zerofill, f167 decimal (63,30) zerofill,
f168 decimal (0,0) unsigned zerofill, f168 decimal (0,0) unsigned zerofill,
f169 decimal (63,30) unsigned zerofill, f169 decimal (63,30) unsigned zerofill,
f170 numeric, f170 numeric,
f171 numeric unsigned, f171 numeric unsigned,
f172 numeric zerofill, f172 numeric zerofill,
f173 numeric unsigned zerofill, f173 numeric unsigned zerofill,
f174 numeric (0), 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 @ b7360593
...@@ -4,56 +4,56 @@ ...@@ -4,56 +4,56 @@
drop table if exists tb4 ; drop table if exists tb4 ;
--enable_warnings --enable_warnings
create table tb4 ( create table tb4 (
f176 numeric (0) unsigned not null DEFAULT 9, f176 numeric (0) unsigned not null DEFAULT 9,
f177 numeric (64) unsigned not null DEFAULT 9, f177 numeric (64) unsigned not null DEFAULT 9,
f178 numeric (0) zerofill not null DEFAULT 9, f178 numeric (0) zerofill not null DEFAULT 9,
f179 numeric (64) zerofill not null DEFAULT 9, f179 numeric (64) zerofill not null DEFAULT 9,
f180 numeric (0) unsigned zerofill not null DEFAULT 9, f180 numeric (0) unsigned zerofill not null DEFAULT 9,
f181 numeric (64) unsigned zerofill not null DEFAULT 9, f181 numeric (64) unsigned zerofill not null DEFAULT 9,
f182 numeric (0,0) not null DEFAULT 9, f182 numeric (0,0) not null DEFAULT 9,
f183 numeric (63,30) not null DEFAULT 9, f183 numeric (63,30) not null DEFAULT 9,
f184 numeric (0,0) unsigned not null DEFAULT 9, f184 numeric (0,0) unsigned not null DEFAULT 9,
f185 numeric (63,30) unsigned not null DEFAULT 9, f185 numeric (63,30) unsigned not null DEFAULT 9,
f186 numeric (0,0) zerofill not null DEFAULT 9, f186 numeric (0,0) zerofill not null DEFAULT 9,
f187 numeric (63,30) zerofill not null DEFAULT 9, f187 numeric (63,30) zerofill not null DEFAULT 9,
f188 numeric (0,0) unsigned zerofill not null DEFAULT 9, f188 numeric (0,0) unsigned zerofill not null DEFAULT 9,
f189 numeric (63,30) unsigned zerofill not null DEFAULT 9, f189 numeric (63,30) unsigned zerofill not null DEFAULT 9,
f190 real not null DEFAULT 88.8, f190 real not null DEFAULT 88.8,
f191 real unsigned not null DEFAULT 88.8, f191 real unsigned not null DEFAULT 88.8,
f192 real zerofill not null DEFAULT 88.8, f192 real zerofill not null DEFAULT 88.8,
f193 real unsigned zerofill not null DEFAULT 88.8, f193 real unsigned zerofill not null DEFAULT 88.8,
f194 double not null DEFAULT 55.5, f194 double not null DEFAULT 55.5,
f195 double unsigned not null DEFAULT 55.5, f195 double unsigned not null DEFAULT 55.5,
f196 double zerofill not null DEFAULT 55.5, f196 double zerofill not null DEFAULT 55.5,
f197 double unsigned zerofill not null DEFAULT 55.5, f197 double unsigned zerofill not null DEFAULT 55.5,
f198 float, f198 float,
f199 float unsigned, f199 float unsigned,
f200 float zerofill, f200 float zerofill,
f201 float unsigned zerofill, f201 float unsigned zerofill,
f202 float(0), f202 float(0),
f203 float(23), f203 float(23),
f204 float(0) unsigned, f204 float(0) unsigned,
f205 float(23) unsigned, f205 float(23) unsigned,
f206 float(0) zerofill, f206 float(0) zerofill,
f207 float(23) zerofill, f207 float(23) zerofill,
f208 float(0) unsigned zerofill, f208 float(0) unsigned zerofill,
f209 float(23) unsigned zerofill, f209 float(23) unsigned zerofill,
f210 float(24), f210 float(24),
f211 float(53), f211 float(53),
f212 float(24) unsigned, f212 float(24) unsigned,
f213 float(53) unsigned, f213 float(53) unsigned,
f214 float(24) zerofill, f214 float(24) zerofill,
f215 float(53) zerofill, f215 float(53) zerofill,
f216 float(24) unsigned zerofill, f216 float(24) unsigned zerofill,
f217 float(53) unsigned zerofill, f217 float(53) unsigned zerofill,
f218 date, f218 date,
f219 time, f219 time,
f220 datetime, f220 datetime,
f221 timestamp, f221 timestamp,
f222 year, f222 year,
f223 year(3), f223 year(3),
f224 year(4), f224 year(4),
f225 enum("1enum","2enum"), f225 enum("1enum","2enum"),
f226 set("1set","2set"), f226 set("1set","2set"),
f236 char(95) unicode, f236 char(95) unicode,
f241 char(255) unicode, f241 char(255) unicode,
...@@ -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 @ b7360593
...@@ -4,65 +4,67 @@ ...@@ -4,65 +4,67 @@
drop table if exists tb1 ; drop table if exists tb1 ;
--enable_warnings --enable_warnings
create table tb1 ( create table tb1 (
f1 char, f1 char,
f2 char binary, f2 char binary,
f3 char ascii, f3 char ascii,
f4 tinytext unicode, f4 tinytext unicode,
f5 text, f5 text,
f6 mediumtext, f6 mediumtext,
f7 longtext, f7 longtext,
f8 tinyblob, f8 tinyblob,
f9 blob, f9 blob,
f10 mediumblob, f10 mediumblob,
f11 longblob, f11 longblob,
f12 binary, f12 binary,
f13 tinyint, f13 tinyint,
f14 tinyint unsigned, f14 tinyint unsigned,
f15 tinyint zerofill, f15 tinyint zerofill,
f16 tinyint unsigned zerofill, f16 tinyint unsigned zerofill,
f17 smallint, f17 smallint,
f18 smallint unsigned, f18 smallint unsigned,
f19 smallint zerofill, f19 smallint zerofill,
f20 smallint unsigned zerofill, f20 smallint unsigned zerofill,
f21 mediumint, f21 mediumint,
f22 mediumint unsigned, f22 mediumint unsigned,
f23 mediumint zerofill, f23 mediumint zerofill,
f24 mediumint unsigned zerofill, f24 mediumint unsigned zerofill,
f25 int, f25 int,
f26 int unsigned, f26 int unsigned,
f27 int zerofill, f27 int zerofill,
f28 int unsigned zerofill, f28 int unsigned zerofill,
f29 bigint, f29 bigint,
f30 bigint unsigned, f30 bigint unsigned,
f31 bigint zerofill, f31 bigint zerofill,
f32 bigint unsigned zerofill, f32 bigint unsigned zerofill,
f33 decimal not null DEFAULT 9.9, f33 decimal not null DEFAULT 9.9,
f34 decimal unsigned not null DEFAULT 9.9, f34 decimal unsigned not null DEFAULT 9.9,
f35 decimal zerofill not null DEFAULT 9.9, f35 decimal zerofill not null DEFAULT 9.9,
f36 decimal unsigned zerofill not null DEFAULT 9.9, f36 decimal unsigned zerofill not null DEFAULT 9.9,
f37 decimal (0) not null DEFAULT 9.9, f37 decimal (0) not null DEFAULT 9.9,
f38 decimal (64) not null DEFAULT 9.9, f38 decimal (64) not null DEFAULT 9.9,
f39 decimal (0) unsigned not null DEFAULT 9.9, f39 decimal (0) unsigned not null DEFAULT 9.9,
f40 decimal (64) unsigned not null DEFAULT 9.9, f40 decimal (64) unsigned not null DEFAULT 9.9,
f41 decimal (0) zerofill not null DEFAULT 9.9, f41 decimal (0) zerofill not null DEFAULT 9.9,
f42 decimal (64) zerofill not null DEFAULT 9.9, f42 decimal (64) zerofill not null DEFAULT 9.9,
f43 decimal (0) unsigned zerofill not null DEFAULT 9.9, f43 decimal (0) unsigned zerofill not null DEFAULT 9.9,
f44 decimal (64) unsigned zerofill not null DEFAULT 9.9, f44 decimal (64) unsigned zerofill not null DEFAULT 9.9,
f45 decimal (0,0) not null DEFAULT 9.9, f45 decimal (0,0) not null DEFAULT 9.9,
f46 decimal (63,30) not null DEFAULT 9.9, f46 decimal (63,30) not null DEFAULT 9.9,
f47 decimal (0,0) unsigned not null DEFAULT 9.9, f47 decimal (0,0) unsigned not null DEFAULT 9.9,
f48 decimal (63,30) unsigned not null DEFAULT 9.9, f48 decimal (63,30) unsigned not null DEFAULT 9.9,
f49 decimal (0,0) zerofill not null DEFAULT 9.9, f49 decimal (0,0) zerofill not null DEFAULT 9.9,
f50 decimal (63,30) zerofill not null DEFAULT 9.9, f50 decimal (63,30) zerofill not null DEFAULT 9.9,
f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9, f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9,
f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9, f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9,
f53 numeric not null DEFAULT 99, f53 numeric not null DEFAULT 99,
f54 numeric unsigned not null DEFAULT 99, f54 numeric unsigned not null DEFAULT 99,
f55 numeric zerofill not null DEFAULT 99, f55 numeric zerofill not null DEFAULT 99,
f56 numeric unsigned zerofill not null DEFAULT 99, f56 numeric unsigned zerofill not null DEFAULT 99,
f57 numeric (0) not null DEFAULT 99, 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 @ b7360593
...@@ -4,77 +4,79 @@ ...@@ -4,77 +4,79 @@
drop table if exists tb2 ; drop table if exists tb2 ;
--enable_warnings --enable_warnings
create table tb2 ( create table tb2 (
f59 numeric (0) unsigned, f59 numeric (0) unsigned,
f60 numeric (64) unsigned, f60 numeric (64) unsigned,
f61 numeric (0) zerofill, f61 numeric (0) zerofill,
f62 numeric (64) zerofill, f62 numeric (64) zerofill,
f63 numeric (0) unsigned zerofill, f63 numeric (0) unsigned zerofill,
f64 numeric (64) unsigned zerofill, f64 numeric (64) unsigned zerofill,
f65 numeric (0,0), f65 numeric (0,0),
f66 numeric (63,30), f66 numeric (63,30),
f67 numeric (0,0) unsigned, f67 numeric (0,0) unsigned,
f68 numeric (63,30) unsigned, f68 numeric (63,30) unsigned,
f69 numeric (0,0) zerofill, f69 numeric (0,0) zerofill,
f70 numeric (63,30) zerofill, f70 numeric (63,30) zerofill,
f71 numeric (0,0) unsigned zerofill, f71 numeric (0,0) unsigned zerofill,
f72 numeric (63,30) unsigned zerofill, f72 numeric (63,30) unsigned zerofill,
f73 real, f73 real,
f74 real unsigned, f74 real unsigned,
f75 real zerofill, f75 real zerofill,
f76 real unsigned zerofill, f76 real unsigned zerofill,
f77 double default 7.7, f77 double default 7.7,
f78 double unsigned default 7.7, f78 double unsigned default 7.7,
f79 double zerofill default 7.7, f79 double zerofill default 7.7,
f80 double unsigned zerofill default 8.8, f80 double unsigned zerofill default 8.8,
f81 float not null default 8.8, f81 float not null default 8.8,
f82 float unsigned not null default 8.8, f82 float unsigned not null default 8.8,
f83 float zerofill not null default 8.8, f83 float zerofill not null default 8.8,
f84 float unsigned zerofill not null default 8.8, f84 float unsigned zerofill not null default 8.8,
f85 float(0) not null default 8.8, f85 float(0) not null default 8.8,
f86 float(23) not null default 8.8, f86 float(23) not null default 8.8,
f87 float(0) unsigned not null default 8.8, f87 float(0) unsigned not null default 8.8,
f88 float(23) unsigned not null default 8.8, f88 float(23) unsigned not null default 8.8,
f89 float(0) zerofill not null default 8.8, f89 float(0) zerofill not null default 8.8,
f90 float(23) zerofill not null default 8.8, f90 float(23) zerofill not null default 8.8,
f91 float(0) unsigned zerofill not null default 8.8, f91 float(0) unsigned zerofill not null default 8.8,
f92 float(23) unsigned zerofill not null default 8.8, f92 float(23) unsigned zerofill not null default 8.8,
f93 float(24) not null default 8.8, f93 float(24) not null default 8.8,
f94 float(53) not null default 8.8, f94 float(53) not null default 8.8,
f95 float(24) unsigned not null default 8.8, f95 float(24) unsigned not null default 8.8,
f96 float(53) unsigned not null default 8.8, f96 float(53) unsigned not null default 8.8,
f97 float(24) zerofill not null default 8.8, f97 float(24) zerofill not null default 8.8,
f98 float(53) zerofill not null default 8.8, f98 float(53) zerofill not null default 8.8,
f99 float(24) unsigned zerofill not null default 8.8, f99 float(24) unsigned zerofill not null default 8.8,
f100 float(53) unsigned zerofill not null default 8.8, f100 float(53) unsigned zerofill not null default 8.8,
f101 date not null default '2000-01-01', f101 date not null default '2000-01-01',
f102 time not null default 20, f102 time not null default 20,
f103 datetime not null default '2/2/2', f103 datetime not null default '2/2/2',
f104 timestamp not null default 20001231235959, f104 timestamp not null default 20001231235959,
f105 year not null default 2000, f105 year not null default 2000,
f106 year(3) not null default 2000, f106 year(3) not null default 2000,
f107 year(4) not null default 2000, 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",
f110 VARBINARY(64) null, f110 VARBINARY(64) null,
f111 VARBINARY(27) null , f111 VARBINARY(27) null ,
f112 VARBINARY(64) null , f112 VARBINARY(64) null ,
f113 VARBINARY(192) null , f113 VARBINARY(192) null ,
f114 VARBINARY(192) , f114 VARBINARY(192) ,
f115 VARBINARY(27) null , f115 VARBINARY(27) null ,
f116 VARBINARY(64) null, f116 VARBINARY(64) null,
f117 VARBINARY(192) null f117 VARBINARY(192) null
) engine = myisam; ) engine = myisam;
# The original columns. They are replaced by varbinary, because the funcs_1 tests should # The original columns. They are replaced by varbinary, because the funcs_1 tests should
# not depend on the optional availability of the geometry feature. # not depend on the optional availability of the geometry feature.
# f110 geometry null, # f110 geometry null,
# f111 point null , # f111 point null ,
# f112 linestring null , # f112 linestring null ,
# f113 polygon null , # f113 polygon null ,
# f114 geometrycollection , # f114 geometrycollection ,
# f115 multipoint null , # f115 multipoint 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 @ b7360593
...@@ -4,65 +4,67 @@ ...@@ -4,65 +4,67 @@
drop table if exists tb3 ; drop table if exists tb3 ;
--enable_warnings --enable_warnings
create table tb3 ( create table tb3 (
f118 char not null DEFAULT 'a', f118 char not null DEFAULT 'a',
f119 char binary not null DEFAULT b'101', f119 char binary not null DEFAULT b'101',
f120 char ascii not null DEFAULT b'101', f120 char ascii not null DEFAULT b'101',
f121 tinytext, f121 tinytext,
f122 text, f122 text,
f123 mediumtext, f123 mediumtext,
f124 longtext unicode, f124 longtext unicode,
f125 tinyblob, f125 tinyblob,
f126 blob, f126 blob,
f127 mediumblob, f127 mediumblob,
f128 longblob, f128 longblob,
f129 binary not null DEFAULT b'101', f129 binary not null DEFAULT b'101',
f130 tinyint not null DEFAULT 99, f130 tinyint not null DEFAULT 99,
f131 tinyint unsigned not null DEFAULT 99, f131 tinyint unsigned not null DEFAULT 99,
f132 tinyint zerofill not null DEFAULT 99, f132 tinyint zerofill not null DEFAULT 99,
f133 tinyint unsigned zerofill not null DEFAULT 99, f133 tinyint unsigned zerofill not null DEFAULT 99,
f134 smallint not null DEFAULT 999, f134 smallint not null DEFAULT 999,
f135 smallint unsigned not null DEFAULT 999, f135 smallint unsigned not null DEFAULT 999,
f136 smallint zerofill not null DEFAULT 999, f136 smallint zerofill not null DEFAULT 999,
f137 smallint unsigned zerofill not null DEFAULT 999, f137 smallint unsigned zerofill not null DEFAULT 999,
f138 mediumint not null DEFAULT 9999, f138 mediumint not null DEFAULT 9999,
f139 mediumint unsigned not null DEFAULT 9999, f139 mediumint unsigned not null DEFAULT 9999,
f140 mediumint zerofill not null DEFAULT 9999, f140 mediumint zerofill not null DEFAULT 9999,
f141 mediumint unsigned zerofill not null DEFAULT 9999, f141 mediumint unsigned zerofill not null DEFAULT 9999,
f142 int not null DEFAULT 99999, f142 int not null DEFAULT 99999,
f143 int unsigned not null DEFAULT 99999, f143 int unsigned not null DEFAULT 99999,
f144 int zerofill not null DEFAULT 99999, f144 int zerofill not null DEFAULT 99999,
f145 int unsigned zerofill not null DEFAULT 99999, f145 int unsigned zerofill not null DEFAULT 99999,
f146 bigint not null DEFAULT 999999, f146 bigint not null DEFAULT 999999,
f147 bigint unsigned not null DEFAULT 999999, f147 bigint unsigned not null DEFAULT 999999,
f148 bigint zerofill not null DEFAULT 999999, f148 bigint zerofill not null DEFAULT 999999,
f149 bigint unsigned zerofill not null DEFAULT 999999, f149 bigint unsigned zerofill not null DEFAULT 999999,
f150 decimal not null DEFAULT 999.999, f150 decimal not null DEFAULT 999.999,
f151 decimal unsigned not null DEFAULT 999.17, f151 decimal unsigned not null DEFAULT 999.17,
f152 decimal zerofill not null DEFAULT 999.999, f152 decimal zerofill not null DEFAULT 999.999,
f153 decimal unsigned zerofill, f153 decimal unsigned zerofill,
f154 decimal (0), f154 decimal (0),
f155 decimal (64), f155 decimal (64),
f156 decimal (0) unsigned, f156 decimal (0) unsigned,
f157 decimal (64) unsigned, f157 decimal (64) unsigned,
f158 decimal (0) zerofill, f158 decimal (0) zerofill,
f159 decimal (64) zerofill, f159 decimal (64) zerofill,
f160 decimal (0) unsigned zerofill, f160 decimal (0) unsigned zerofill,
f161 decimal (64) unsigned zerofill, f161 decimal (64) unsigned zerofill,
f162 decimal (0,0), f162 decimal (0,0),
f163 decimal (63,30), f163 decimal (63,30),
f164 decimal (0,0) unsigned, f164 decimal (0,0) unsigned,
f165 decimal (63,30) unsigned, f165 decimal (63,30) unsigned,
f166 decimal (0,0) zerofill, f166 decimal (0,0) zerofill,
f167 decimal (63,30) zerofill, f167 decimal (63,30) zerofill,
f168 decimal (0,0) unsigned zerofill, f168 decimal (0,0) unsigned zerofill,
f169 decimal (63,30) unsigned zerofill, f169 decimal (63,30) unsigned zerofill,
f170 numeric, f170 numeric,
f171 numeric unsigned, f171 numeric unsigned,
f172 numeric zerofill, f172 numeric zerofill,
f173 numeric unsigned zerofill, f173 numeric unsigned zerofill,
f174 numeric (0), 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 @ b7360593
...@@ -4,64 +4,64 @@ ...@@ -4,64 +4,64 @@
drop table if exists tb4 ; drop table if exists tb4 ;
--enable_warnings --enable_warnings
create table tb4 ( create table tb4 (
f176 numeric (0) unsigned not null DEFAULT 9, f176 numeric (0) unsigned not null DEFAULT 9,
f177 numeric (64) unsigned not null DEFAULT 9, f177 numeric (64) unsigned not null DEFAULT 9,
f178 numeric (0) zerofill not null DEFAULT 9, f178 numeric (0) zerofill not null DEFAULT 9,
f179 numeric (64) zerofill not null DEFAULT 9, f179 numeric (64) zerofill not null DEFAULT 9,
f180 numeric (0) unsigned zerofill not null DEFAULT 9, f180 numeric (0) unsigned zerofill not null DEFAULT 9,
f181 numeric (64) unsigned zerofill not null DEFAULT 9, f181 numeric (64) unsigned zerofill not null DEFAULT 9,
f182 numeric (0,0) not null DEFAULT 9, f182 numeric (0,0) not null DEFAULT 9,
f183 numeric (63,30) not null DEFAULT 9, f183 numeric (63,30) not null DEFAULT 9,
f184 numeric (0,0) unsigned not null DEFAULT 9, f184 numeric (0,0) unsigned not null DEFAULT 9,
f185 numeric (63,30) unsigned not null DEFAULT 9, f185 numeric (63,30) unsigned not null DEFAULT 9,
f186 numeric (0,0) zerofill not null DEFAULT 9, f186 numeric (0,0) zerofill not null DEFAULT 9,
f187 numeric (63,30) zerofill not null DEFAULT 9, f187 numeric (63,30) zerofill not null DEFAULT 9,
f188 numeric (0,0) unsigned zerofill not null DEFAULT 9, f188 numeric (0,0) unsigned zerofill not null DEFAULT 9,
f189 numeric (63,30) unsigned zerofill not null DEFAULT 9, f189 numeric (63,30) unsigned zerofill not null DEFAULT 9,
f190 real not null DEFAULT 88.8, f190 real not null DEFAULT 88.8,
f191 real unsigned not null DEFAULT 88.8, f191 real unsigned not null DEFAULT 88.8,
f192 real zerofill not null DEFAULT 88.8, f192 real zerofill not null DEFAULT 88.8,
f193 real unsigned zerofill not null DEFAULT 88.8, f193 real unsigned zerofill not null DEFAULT 88.8,
f194 double not null DEFAULT 55.5, f194 double not null DEFAULT 55.5,
f195 double unsigned not null DEFAULT 55.5, f195 double unsigned not null DEFAULT 55.5,
f196 double zerofill not null DEFAULT 55.5, f196 double zerofill not null DEFAULT 55.5,
f197 double unsigned zerofill not null DEFAULT 55.5, f197 double unsigned zerofill not null DEFAULT 55.5,
f198 float, f198 float,
f199 float unsigned, f199 float unsigned,
f200 float zerofill, f200 float zerofill,
f201 float unsigned zerofill, f201 float unsigned zerofill,
f202 float(0), f202 float(0),
f203 float(23), f203 float(23),
f204 float(0) unsigned, f204 float(0) unsigned,
f205 float(23) unsigned, f205 float(23) unsigned,
f206 float(0) zerofill, f206 float(0) zerofill,
f207 float(23) zerofill, f207 float(23) zerofill,
f208 float(0) unsigned zerofill, f208 float(0) unsigned zerofill,
f209 float(23) unsigned zerofill, f209 float(23) unsigned zerofill,
f210 float(24), f210 float(24),
f211 float(53), f211 float(53),
f212 float(24) unsigned, f212 float(24) unsigned,
f213 float(53) unsigned, f213 float(53) unsigned,
f214 float(24) zerofill, f214 float(24) zerofill,
f215 float(53) zerofill, f215 float(53) zerofill,
f216 float(24) unsigned zerofill, f216 float(24) unsigned zerofill,
f217 float(53) unsigned zerofill, f217 float(53) unsigned zerofill,
f218 date, f218 date,
f219 time, f219 time,
f220 datetime, f220 datetime,
f221 timestamp, f221 timestamp,
f222 year, f222 year,
f223 year(3), f223 year(3),
f224 year(4), f224 year(4),
f225 enum("1enum","2enum"), f225 enum("1enum","2enum"),
f226 set("1set","2set"), f226 set("1set","2set"),
f227 VARBINARY(64), f227 VARBINARY(64),
f228 VARBINARY(27), f228 VARBINARY(27),
f229 VARBINARY(64), f229 VARBINARY(64),
f230 VARBINARY(192), f230 VARBINARY(192),
f231 VARBINARY(192), f231 VARBINARY(192),
f232 VARBINARY(27), f232 VARBINARY(27),
f233 VARBINARY(64), f233 VARBINARY(64),
f234 VARBINARY(192), f234 VARBINARY(192),
f235 char(255) unicode, f235 char(255) unicode,
f236 char(60) ascii, f236 char(60) ascii,
...@@ -75,14 +75,16 @@ f242 bit(30) ...@@ -75,14 +75,16 @@ f242 bit(30)
# The original columns. They are replaced by varbinary, because the funcs_1 tests should # The original columns. They are replaced by varbinary, because the funcs_1 tests should
# not depend on the optional availability of the geometry feature. # not depend on the optional availability of the geometry feature.
# f227 geometry, # f227 geometry,
# f228 point, # f228 point,
# f229 linestring, # f229 linestring,
# f230 polygon, # f230 polygon,
# f231 geometrycollection, # f231 geometrycollection,
# f232 multipoint, # f232 multipoint,
# 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 @ b7360593
...@@ -4,66 +4,67 @@ ...@@ -4,66 +4,67 @@
drop table if exists tb1 ; drop table if exists tb1 ;
--enable_warnings --enable_warnings
create table tb1 ( create table tb1 (
f1 char(0), f1 char(0),
f2 char(0) binary, f2 char(0) binary,
f3 char(0) ascii, f3 char(0) ascii,
f4 tinytext unicode, f4 tinytext unicode,
f5 text, f5 text,
f6 mediumtext, f6 mediumtext,
f7 longtext, f7 longtext,
f8 tinyblob, f8 tinyblob,
f9 blob, f9 blob,
f10 mediumblob, f10 mediumblob,
f11 longblob, f11 longblob,
f12 binary, f12 binary,
f13 tinyint, f13 tinyint,
f14 tinyint unsigned, f14 tinyint unsigned,
f15 tinyint zerofill, f15 tinyint zerofill,
f16 tinyint unsigned zerofill, f16 tinyint unsigned zerofill,
f17 smallint, f17 smallint,
f18 smallint unsigned, f18 smallint unsigned,
f19 smallint zerofill, f19 smallint zerofill,
f20 smallint unsigned zerofill, f20 smallint unsigned zerofill,
f21 mediumint, f21 mediumint,
f22 mediumint unsigned, f22 mediumint unsigned,
f23 mediumint zerofill, f23 mediumint zerofill,
f24 mediumint unsigned zerofill, f24 mediumint unsigned zerofill,
f25 int, f25 int,
f26 int unsigned, f26 int unsigned,
f27 int zerofill, f27 int zerofill,
f28 int unsigned zerofill, f28 int unsigned zerofill,
f29 bigint, f29 bigint,
f30 bigint unsigned, f30 bigint unsigned,
f31 bigint zerofill, f31 bigint zerofill,
f32 bigint unsigned zerofill, f32 bigint unsigned zerofill,
f33 decimal, f33 decimal,
f34 decimal unsigned, f34 decimal unsigned,
f35 decimal zerofill, f35 decimal zerofill,
f36 decimal unsigned zerofill not null DEFAULT 9.9, f36 decimal unsigned zerofill not null DEFAULT 9.9,
f37 decimal (0) not null DEFAULT 9.9, f37 decimal (0) not null DEFAULT 9.9,
f38 decimal (64) not null DEFAULT 9.9, f38 decimal (64) not null DEFAULT 9.9,
f39 decimal (0) unsigned not null DEFAULT 9.9, f39 decimal (0) unsigned not null DEFAULT 9.9,
f40 decimal (64) unsigned not null DEFAULT 9.9, f40 decimal (64) unsigned not null DEFAULT 9.9,
f41 decimal (0) zerofill not null DEFAULT 9.9, f41 decimal (0) zerofill not null DEFAULT 9.9,
f42 decimal (64) zerofill not null DEFAULT 9.9, f42 decimal (64) zerofill not null DEFAULT 9.9,
f43 decimal (0) unsigned zerofill not null DEFAULT 9.9, f43 decimal (0) unsigned zerofill not null DEFAULT 9.9,
f44 decimal (64) unsigned zerofill not null DEFAULT 9.9, f44 decimal (64) unsigned zerofill not null DEFAULT 9.9,
f45 decimal (0,0) not null DEFAULT 9.9, f45 decimal (0,0) not null DEFAULT 9.9,
f46 decimal (63,30) not null DEFAULT 9.9, f46 decimal (63,30) not null DEFAULT 9.9,
f47 decimal (0,0) unsigned not null DEFAULT 9.9, f47 decimal (0,0) unsigned not null DEFAULT 9.9,
f48 decimal (63,30) unsigned not null DEFAULT 9.9, f48 decimal (63,30) unsigned not null DEFAULT 9.9,
f49 decimal (0,0) zerofill not null DEFAULT 9.9, f49 decimal (0,0) zerofill not null DEFAULT 9.9,
f50 decimal (63,30) zerofill not null DEFAULT 9.9, f50 decimal (63,30) zerofill not null DEFAULT 9.9,
f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9, f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9,
f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9, f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9,
f53 numeric not null DEFAULT 99, f53 numeric not null DEFAULT 99,
f54 numeric unsigned not null DEFAULT 99, f54 numeric unsigned not null DEFAULT 99,
f55 numeric zerofill not null DEFAULT 99, f55 numeric zerofill not null DEFAULT 99,
f56 numeric unsigned zerofill not null DEFAULT 99, f56 numeric unsigned zerofill not null DEFAULT 99,
f57 numeric (0) not null DEFAULT 99, 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 @ b7360593
...@@ -4,58 +4,60 @@ ...@@ -4,58 +4,60 @@
drop table if exists tb2 ; drop table if exists tb2 ;
--enable_warnings --enable_warnings
create table tb2 ( create table tb2 (
f59 numeric (0) unsigned, f59 numeric (0) unsigned,
f60 numeric (64) unsigned, f60 numeric (64) unsigned,
f61 numeric (0) zerofill, f61 numeric (0) zerofill,
f62 numeric (64) zerofill, f62 numeric (64) zerofill,
f63 numeric (0) unsigned zerofill, f63 numeric (0) unsigned zerofill,
f64 numeric (64) unsigned zerofill, f64 numeric (64) unsigned zerofill,
f65 numeric (0,0), f65 numeric (0,0),
f66 numeric (63,30), f66 numeric (63,30),
f67 numeric (0,0) unsigned, f67 numeric (0,0) unsigned,
f68 numeric (63,30) unsigned, f68 numeric (63,30) unsigned,
f69 numeric (0,0) zerofill, f69 numeric (0,0) zerofill,
f70 numeric (63,30) zerofill, f70 numeric (63,30) zerofill,
f71 numeric (0,0) unsigned zerofill, f71 numeric (0,0) unsigned zerofill,
f72 numeric (63,30) unsigned zerofill, f72 numeric (63,30) unsigned zerofill,
f73 real, f73 real,
f74 real unsigned, f74 real unsigned,
f75 real zerofill, f75 real zerofill,
f76 real unsigned zerofill, f76 real unsigned zerofill,
f77 double default 7.7, f77 double default 7.7,
f78 double unsigned default 7.7, f78 double unsigned default 7.7,
f79 double zerofill default 7.7, f79 double zerofill default 7.7,
f80 double unsigned zerofill default 8.8, f80 double unsigned zerofill default 8.8,
f81 float not null default 8.8, f81 float not null default 8.8,
f82 float unsigned not null default 8.8, f82 float unsigned not null default 8.8,
f83 float zerofill not null default 8.8, f83 float zerofill not null default 8.8,
f84 float unsigned zerofill not null default 8.8, f84 float unsigned zerofill not null default 8.8,
f85 float(0) not null default 8.8, f85 float(0) not null default 8.8,
f86 float(23) not null default 8.8, f86 float(23) not null default 8.8,
f87 float(0) unsigned not null default 8.8, f87 float(0) unsigned not null default 8.8,
f88 float(23) unsigned not null default 8.8, f88 float(23) unsigned not null default 8.8,
f89 float(0) zerofill not null default 8.8, f89 float(0) zerofill not null default 8.8,
f90 float(23) zerofill not null default 8.8, f90 float(23) zerofill not null default 8.8,
f91 float(0) unsigned zerofill not null default 8.8, f91 float(0) unsigned zerofill not null default 8.8,
f92 float(23) unsigned zerofill not null default 8.8, f92 float(23) unsigned zerofill not null default 8.8,
f93 float(24) not null default 8.8, f93 float(24) not null default 8.8,
f94 float(53) not null default 8.8, f94 float(53) not null default 8.8,
f95 float(24) unsigned not null default 8.8, f95 float(24) unsigned not null default 8.8,
f96 float(53) unsigned not null default 8.8, f96 float(53) unsigned not null default 8.8,
f97 float(24) zerofill not null default 8.8, f97 float(24) zerofill not null default 8.8,
f98 float(53) zerofill not null default 8.8, f98 float(53) zerofill not null default 8.8,
f99 float(24) unsigned zerofill not null default 8.8, f99 float(24) unsigned zerofill not null default 8.8,
f100 float(53) unsigned zerofill not null default 8.8, f100 float(53) unsigned zerofill not null default 8.8,
f101 date not null default '2000-01-01', f101 date not null default '2000-01-01',
f102 time not null default 20, f102 time not null default 20,
f103 datetime not null default '2/2/2', f103 datetime not null default '2/2/2',
f104 timestamp not null default 20001231235959, f104 timestamp not null default 20001231235959,
f105 year not null default 2000, f105 year not null default 2000,
f106 year(3) not null default 2000, f106 year(3) not null default 2000,
f107 year(4) not null default 2000, 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 = 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 @ b7360593
...@@ -4,65 +4,67 @@ ...@@ -4,65 +4,67 @@
drop table if exists tb3 ; drop table if exists tb3 ;
--enable_warnings --enable_warnings
create table tb3 ( create table tb3 (
f118 char not null DEFAULT 'a', f118 char not null DEFAULT 'a',
f119 char binary not null DEFAULT b'101', f119 char binary not null DEFAULT b'101',
f120 char ascii not null DEFAULT b'101', f120 char ascii not null DEFAULT b'101',
f121 tinytext, f121 tinytext,
f122 text, f122 text,
f123 mediumtext, f123 mediumtext,
f124 longtext unicode, f124 longtext unicode,
f125 tinyblob, f125 tinyblob,
f126 blob, f126 blob,
f127 mediumblob, f127 mediumblob,
f128 longblob, f128 longblob,
f129 binary not null DEFAULT b'101', f129 binary not null DEFAULT b'101',
f130 tinyint not null DEFAULT 99, f130 tinyint not null DEFAULT 99,
f131 tinyint unsigned not null DEFAULT 99, f131 tinyint unsigned not null DEFAULT 99,
f132 tinyint zerofill not null DEFAULT 99, f132 tinyint zerofill not null DEFAULT 99,
f133 tinyint unsigned zerofill not null DEFAULT 99, f133 tinyint unsigned zerofill not null DEFAULT 99,
f134 smallint not null DEFAULT 999, f134 smallint not null DEFAULT 999,
f135 smallint unsigned not null DEFAULT 999, f135 smallint unsigned not null DEFAULT 999,
f136 smallint zerofill not null DEFAULT 999, f136 smallint zerofill not null DEFAULT 999,
f137 smallint unsigned zerofill not null DEFAULT 999, f137 smallint unsigned zerofill not null DEFAULT 999,
f138 mediumint not null DEFAULT 9999, f138 mediumint not null DEFAULT 9999,
f139 mediumint unsigned not null DEFAULT 9999, f139 mediumint unsigned not null DEFAULT 9999,
f140 mediumint zerofill not null DEFAULT 9999, f140 mediumint zerofill not null DEFAULT 9999,
f141 mediumint unsigned zerofill not null DEFAULT 9999, f141 mediumint unsigned zerofill not null DEFAULT 9999,
f142 int not null DEFAULT 99999, f142 int not null DEFAULT 99999,
f143 int unsigned not null DEFAULT 99999, f143 int unsigned not null DEFAULT 99999,
f144 int zerofill not null DEFAULT 99999, f144 int zerofill not null DEFAULT 99999,
f145 int unsigned zerofill not null DEFAULT 99999, f145 int unsigned zerofill not null DEFAULT 99999,
f146 bigint not null DEFAULT 999999, f146 bigint not null DEFAULT 999999,
f147 bigint unsigned not null DEFAULT 999999, f147 bigint unsigned not null DEFAULT 999999,
f148 bigint zerofill not null DEFAULT 999999, f148 bigint zerofill not null DEFAULT 999999,
f149 bigint unsigned zerofill not null DEFAULT 999999, f149 bigint unsigned zerofill not null DEFAULT 999999,
f150 decimal not null DEFAULT 999.999, f150 decimal not null DEFAULT 999.999,
f151 decimal unsigned not null DEFAULT 999.17, f151 decimal unsigned not null DEFAULT 999.17,
f152 decimal zerofill not null DEFAULT 999.999, f152 decimal zerofill not null DEFAULT 999.999,
f153 decimal unsigned zerofill, f153 decimal unsigned zerofill,
f154 decimal (0), f154 decimal (0),
f155 decimal (64), f155 decimal (64),
f156 decimal (0) unsigned, f156 decimal (0) unsigned,
f157 decimal (64) unsigned, f157 decimal (64) unsigned,
f158 decimal (0) zerofill, f158 decimal (0) zerofill,
f159 decimal (64) zerofill, f159 decimal (64) zerofill,
f160 decimal (0) unsigned zerofill, f160 decimal (0) unsigned zerofill,
f161 decimal (64) unsigned zerofill, f161 decimal (64) unsigned zerofill,
f162 decimal (0,0), f162 decimal (0,0),
f163 decimal (63,30), f163 decimal (63,30),
f164 decimal (0,0) unsigned, f164 decimal (0,0) unsigned,
f165 decimal (63,30) unsigned, f165 decimal (63,30) unsigned,
f166 decimal (0,0) zerofill, f166 decimal (0,0) zerofill,
f167 decimal (63,30) zerofill, f167 decimal (63,30) zerofill,
f168 decimal (0,0) unsigned zerofill, f168 decimal (0,0) unsigned zerofill,
f169 decimal (63,30) unsigned zerofill, f169 decimal (63,30) unsigned zerofill,
f170 numeric, f170 numeric,
f171 numeric unsigned, f171 numeric unsigned,
f172 numeric zerofill, f172 numeric zerofill,
f173 numeric unsigned zerofill, f173 numeric unsigned zerofill,
f174 numeric (0), 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 @ b7360593
...@@ -4,56 +4,56 @@ ...@@ -4,56 +4,56 @@
drop table if exists tb4; drop table if exists tb4;
--enable_warnings --enable_warnings
create table tb4 ( create table tb4 (
f176 numeric (0) unsigned not null DEFAULT 9, f176 numeric (0) unsigned not null DEFAULT 9,
f177 numeric (64) unsigned not null DEFAULT 9, f177 numeric (64) unsigned not null DEFAULT 9,
f178 numeric (0) zerofill not null DEFAULT 9, f178 numeric (0) zerofill not null DEFAULT 9,
f179 numeric (64) zerofill not null DEFAULT 9, f179 numeric (64) zerofill not null DEFAULT 9,
f180 numeric (0) unsigned zerofill not null DEFAULT 9, f180 numeric (0) unsigned zerofill not null DEFAULT 9,
f181 numeric (64) unsigned zerofill not null DEFAULT 9, f181 numeric (64) unsigned zerofill not null DEFAULT 9,
f182 numeric (0,0) not null DEFAULT 9, f182 numeric (0,0) not null DEFAULT 9,
f183 numeric (63,30) not null DEFAULT 9, f183 numeric (63,30) not null DEFAULT 9,
f184 numeric (0,0) unsigned not null DEFAULT 9, f184 numeric (0,0) unsigned not null DEFAULT 9,
f185 numeric (63,30) unsigned not null DEFAULT 9, f185 numeric (63,30) unsigned not null DEFAULT 9,
f186 numeric (0,0) zerofill not null DEFAULT 9, f186 numeric (0,0) zerofill not null DEFAULT 9,
f187 numeric (63,30) zerofill not null DEFAULT 9, f187 numeric (63,30) zerofill not null DEFAULT 9,
f188 numeric (0,0) unsigned zerofill not null DEFAULT 9, f188 numeric (0,0) unsigned zerofill not null DEFAULT 9,
f189 numeric (63,30) unsigned zerofill not null DEFAULT 9, f189 numeric (63,30) unsigned zerofill not null DEFAULT 9,
f190 real not null DEFAULT 88.8, f190 real not null DEFAULT 88.8,
f191 real unsigned not null DEFAULT 88.8, f191 real unsigned not null DEFAULT 88.8,
f192 real zerofill not null DEFAULT 88.8, f192 real zerofill not null DEFAULT 88.8,
f193 real unsigned zerofill not null DEFAULT 88.8, f193 real unsigned zerofill not null DEFAULT 88.8,
f194 double not null DEFAULT 55.5, f194 double not null DEFAULT 55.5,
f195 double unsigned not null DEFAULT 55.5, f195 double unsigned not null DEFAULT 55.5,
f196 double zerofill not null DEFAULT 55.5, f196 double zerofill not null DEFAULT 55.5,
f197 double unsigned zerofill not null DEFAULT 55.5, f197 double unsigned zerofill not null DEFAULT 55.5,
f198 float, f198 float,
f199 float unsigned, f199 float unsigned,
f200 float zerofill, f200 float zerofill,
f201 float unsigned zerofill, f201 float unsigned zerofill,
f202 float(0), f202 float(0),
f203 float(23), f203 float(23),
f204 float(0) unsigned, f204 float(0) unsigned,
f205 float(23) unsigned, f205 float(23) unsigned,
f206 float(0) zerofill, f206 float(0) zerofill,
f207 float(23) zerofill, f207 float(23) zerofill,
f208 float(0) unsigned zerofill, f208 float(0) unsigned zerofill,
f209 float(23) unsigned zerofill, f209 float(23) unsigned zerofill,
f210 float(24), f210 float(24),
f211 float(53), f211 float(53),
f212 float(24) unsigned, f212 float(24) unsigned,
f213 float(53) unsigned, f213 float(53) unsigned,
f214 float(24) zerofill, f214 float(24) zerofill,
f215 float(53) zerofill, f215 float(53) zerofill,
f216 float(24) unsigned zerofill, f216 float(24) unsigned zerofill,
f217 float(53) unsigned zerofill, f217 float(53) unsigned zerofill,
f218 date, f218 date,
f219 time, f219 time,
f220 datetime, f220 datetime,
f221 timestamp, f221 timestamp,
f222 year, f222 year,
f223 year(3), f223 year(3),
f224 year(4), f224 year(4),
f225 enum("1enum","2enum"), f225 enum("1enum","2enum"),
f226 set("1set","2set"), f226 set("1set","2set"),
f235 char(0) unicode, f235 char(0) unicode,
f236 char(90), f236 char(90),
...@@ -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 @ b7360593
...@@ -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 @ b7360593
...@@ -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 @ b7360593
...@@ -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 @ b7360593
...@@ -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 @ b7360593
...@@ -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 @ b7360593
...@@ -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 @ b7360593
...@@ -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:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
...@@ -383,7 +391,7 @@ DROP TABLE temp; ...@@ -383,7 +391,7 @@ DROP TABLE temp;
Testcase 3.1.10.8: Testcase 3.1.10.8:
------------------ ------------------
Ensure that the mysql_affected_rows() C API function always returns the correct Ensure that the mysql_affected_rows() C API function always returns the correct
number of rows affected by the execution of a stored procedure. number of rows affected by the execution of a stored procedure.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
mysql-test/suite/funcs_1/r/innodb_trig_03.result
View file @ b7360593
USE test; USE test;
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',
f119 char binary not null DEFAULT b'101', f119 char binary not null DEFAULT b'101',
f120 char ascii not null DEFAULT b'101', f120 char ascii not null DEFAULT b'101',
f121 tinytext, f121 tinytext,
f122 text, f122 text,
f123 mediumtext, f123 mediumtext,
f124 longtext unicode, f124 longtext unicode,
f125 tinyblob, f125 tinyblob,
f126 blob, f126 blob,
f127 mediumblob, f127 mediumblob,
f128 longblob, f128 longblob,
f129 binary not null DEFAULT b'101', f129 binary not null DEFAULT b'101',
f130 tinyint not null DEFAULT 99, f130 tinyint not null DEFAULT 99,
f131 tinyint unsigned not null DEFAULT 99, f131 tinyint unsigned not null DEFAULT 99,
f132 tinyint zerofill not null DEFAULT 99, f132 tinyint zerofill not null DEFAULT 99,
f133 tinyint unsigned zerofill not null DEFAULT 99, f133 tinyint unsigned zerofill not null DEFAULT 99,
f134 smallint not null DEFAULT 999, f134 smallint not null DEFAULT 999,
f135 smallint unsigned not null DEFAULT 999, f135 smallint unsigned not null DEFAULT 999,
f136 smallint zerofill not null DEFAULT 999, f136 smallint zerofill not null DEFAULT 999,
f137 smallint unsigned zerofill not null DEFAULT 999, f137 smallint unsigned zerofill not null DEFAULT 999,
f138 mediumint not null DEFAULT 9999, f138 mediumint not null DEFAULT 9999,
f139 mediumint unsigned not null DEFAULT 9999, f139 mediumint unsigned not null DEFAULT 9999,
f140 mediumint zerofill not null DEFAULT 9999, f140 mediumint zerofill not null DEFAULT 9999,
f141 mediumint unsigned zerofill not null DEFAULT 9999, f141 mediumint unsigned zerofill not null DEFAULT 9999,
f142 int not null DEFAULT 99999, f142 int not null DEFAULT 99999,
f143 int unsigned not null DEFAULT 99999, f143 int unsigned not null DEFAULT 99999,
f144 int zerofill not null DEFAULT 99999, f144 int zerofill not null DEFAULT 99999,
f145 int unsigned zerofill not null DEFAULT 99999, f145 int unsigned zerofill not null DEFAULT 99999,
f146 bigint not null DEFAULT 999999, f146 bigint not null DEFAULT 999999,
f147 bigint unsigned not null DEFAULT 999999, f147 bigint unsigned not null DEFAULT 999999,
f148 bigint zerofill not null DEFAULT 999999, f148 bigint zerofill not null DEFAULT 999999,
f149 bigint unsigned zerofill not null DEFAULT 999999, f149 bigint unsigned zerofill not null DEFAULT 999999,
f150 decimal not null DEFAULT 999.999, f150 decimal not null DEFAULT 999.999,
f151 decimal unsigned not null DEFAULT 999.17, f151 decimal unsigned not null DEFAULT 999.17,
f152 decimal zerofill not null DEFAULT 999.999, f152 decimal zerofill not null DEFAULT 999.999,
f153 decimal unsigned zerofill, f153 decimal unsigned zerofill,
f154 decimal (0), f154 decimal (0),
f155 decimal (64), f155 decimal (64),
f156 decimal (0) unsigned, f156 decimal (0) unsigned,
f157 decimal (64) unsigned, f157 decimal (64) unsigned,
f158 decimal (0) zerofill, f158 decimal (0) zerofill,
f159 decimal (64) zerofill, f159 decimal (64) zerofill,
f160 decimal (0) unsigned zerofill, f160 decimal (0) unsigned zerofill,
f161 decimal (64) unsigned zerofill, f161 decimal (64) unsigned zerofill,
f162 decimal (0,0), f162 decimal (0,0),
f163 decimal (63,30), f163 decimal (63,30),
f164 decimal (0,0) unsigned, f164 decimal (0,0) unsigned,
f165 decimal (63,30) unsigned, f165 decimal (63,30) unsigned,
f166 decimal (0,0) zerofill, f166 decimal (0,0) zerofill,
f167 decimal (63,30) zerofill, f167 decimal (63,30) zerofill,
f168 decimal (0,0) unsigned zerofill, f168 decimal (0,0) unsigned zerofill,
f169 decimal (63,30) unsigned zerofill, f169 decimal (63,30) unsigned zerofill,
f170 numeric, f170 numeric,
f171 numeric unsigned, f171 numeric unsigned,
f172 numeric zerofill, f172 numeric zerofill,
f173 numeric unsigned zerofill, f173 numeric unsigned zerofill,
f174 numeric (0), f174 numeric (0),
f175 numeric (64) f175 numeric (64)
) engine = innodb; ) engine = innodb;
Warnings: 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 @ b7360593
...@@ -989,7 +989,7 @@ root@localhost ...@@ -989,7 +989,7 @@ root@localhost
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
grant select, insert, update ,trigger grant select, insert, update ,trigger
on priv_db.t1 to test_yesprivs@localhost on priv_db.t1 to test_yesprivs@localhost
with grant option; with grant option;
grant select grant select
on priv_db.t1 to test_useprivs@localhost; on priv_db.t1 to test_useprivs@localhost;
...@@ -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
...@@ -1252,7 +1252,7 @@ create definer=not_ex_user@localhost trigger trg1_0 ...@@ -1252,7 +1252,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';
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need the SUPER privilege for this operation
create definer=current_user trigger trg1_1 create definer=current_user trigger trg1_1
before INSERT on t1 for each row before INSERT on t1 for each row
set new.f1 = 'trig 1_1-yes'; set new.f1 = 'trig 1_1-yes';
insert into t1 (f1) values ('insert-no'); insert into t1 (f1) values ('insert-no');
...@@ -1318,7 +1318,7 @@ current_user ...@@ -1318,7 +1318,7 @@ current_user
test_yesprivs@localhost test_yesprivs@localhost
use priv_db; use priv_db;
set autocommit=0; set autocommit=0;
create definer=current_user trigger trg1_1 create definer=current_user trigger trg1_1
before INSERT on t1 for each row before INSERT on t1 for each row
set new.f1 = 'trig 1_1-yes'; set new.f1 = 'trig 1_1-yes';
rollback work; rollback work;
...@@ -1564,7 +1564,7 @@ select current_user; ...@@ -1564,7 +1564,7 @@ select current_user;
current_user current_user
root@localhost root@localhost
revoke UPDATE(f1) on priv_db.t1 from test_yesprivs@localhost; revoke UPDATE(f1) on priv_db.t1 from test_yesprivs@localhost;
grant TRIGGER,UPDATE(f2),UPDATE(f3) on priv_db.t1 grant TRIGGER,UPDATE(f2),UPDATE(f3) on priv_db.t1
to test_yesprivs@localhost; to test_yesprivs@localhost;
show grants for test_yesprivs@localhost; show grants for test_yesprivs@localhost;
Grants for test_yesprivs@localhost Grants for test_yesprivs@localhost
......
mysql-test/suite/funcs_1/r/innodb_trig_0407.result
View file @ b7360593
USE test; USE test;
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',
f119 char binary not null DEFAULT b'101', f119 char binary not null DEFAULT b'101',
f120 char ascii not null DEFAULT b'101', f120 char ascii not null DEFAULT b'101',
f121 tinytext, f121 tinytext,
f122 text, f122 text,
f123 mediumtext, f123 mediumtext,
f124 longtext unicode, f124 longtext unicode,
f125 tinyblob, f125 tinyblob,
f126 blob, f126 blob,
f127 mediumblob, f127 mediumblob,
f128 longblob, f128 longblob,
f129 binary not null DEFAULT b'101', f129 binary not null DEFAULT b'101',
f130 tinyint not null DEFAULT 99, f130 tinyint not null DEFAULT 99,
f131 tinyint unsigned not null DEFAULT 99, f131 tinyint unsigned not null DEFAULT 99,
f132 tinyint zerofill not null DEFAULT 99, f132 tinyint zerofill not null DEFAULT 99,
f133 tinyint unsigned zerofill not null DEFAULT 99, f133 tinyint unsigned zerofill not null DEFAULT 99,
f134 smallint not null DEFAULT 999, f134 smallint not null DEFAULT 999,
f135 smallint unsigned not null DEFAULT 999, f135 smallint unsigned not null DEFAULT 999,
f136 smallint zerofill not null DEFAULT 999, f136 smallint zerofill not null DEFAULT 999,
f137 smallint unsigned zerofill not null DEFAULT 999, f137 smallint unsigned zerofill not null DEFAULT 999,
f138 mediumint not null DEFAULT 9999, f138 mediumint not null DEFAULT 9999,
f139 mediumint unsigned not null DEFAULT 9999, f139 mediumint unsigned not null DEFAULT 9999,
f140 mediumint zerofill not null DEFAULT 9999, f140 mediumint zerofill not null DEFAULT 9999,
f141 mediumint unsigned zerofill not null DEFAULT 9999, f141 mediumint unsigned zerofill not null DEFAULT 9999,
f142 int not null DEFAULT 99999, f142 int not null DEFAULT 99999,
f143 int unsigned not null DEFAULT 99999, f143 int unsigned not null DEFAULT 99999,
f144 int zerofill not null DEFAULT 99999, f144 int zerofill not null DEFAULT 99999,
f145 int unsigned zerofill not null DEFAULT 99999, f145 int unsigned zerofill not null DEFAULT 99999,
f146 bigint not null DEFAULT 999999, f146 bigint not null DEFAULT 999999,
f147 bigint unsigned not null DEFAULT 999999, f147 bigint unsigned not null DEFAULT 999999,
f148 bigint zerofill not null DEFAULT 999999, f148 bigint zerofill not null DEFAULT 999999,
f149 bigint unsigned zerofill not null DEFAULT 999999, f149 bigint unsigned zerofill not null DEFAULT 999999,
f150 decimal not null DEFAULT 999.999, f150 decimal not null DEFAULT 999.999,
f151 decimal unsigned not null DEFAULT 999.17, f151 decimal unsigned not null DEFAULT 999.17,
f152 decimal zerofill not null DEFAULT 999.999, f152 decimal zerofill not null DEFAULT 999.999,
f153 decimal unsigned zerofill, f153 decimal unsigned zerofill,
f154 decimal (0), f154 decimal (0),
f155 decimal (64), f155 decimal (64),
f156 decimal (0) unsigned, f156 decimal (0) unsigned,
f157 decimal (64) unsigned, f157 decimal (64) unsigned,
f158 decimal (0) zerofill, f158 decimal (0) zerofill,
f159 decimal (64) zerofill, f159 decimal (64) zerofill,
f160 decimal (0) unsigned zerofill, f160 decimal (0) unsigned zerofill,
f161 decimal (64) unsigned zerofill, f161 decimal (64) unsigned zerofill,
f162 decimal (0,0), f162 decimal (0,0),
f163 decimal (63,30), f163 decimal (63,30),
f164 decimal (0,0) unsigned, f164 decimal (0,0) unsigned,
f165 decimal (63,30) unsigned, f165 decimal (63,30) unsigned,
f166 decimal (0,0) zerofill, f166 decimal (0,0) zerofill,
f167 decimal (63,30) zerofill, f167 decimal (63,30) zerofill,
f168 decimal (0,0) unsigned zerofill, f168 decimal (0,0) unsigned zerofill,
f169 decimal (63,30) unsigned zerofill, f169 decimal (63,30) unsigned zerofill,
f170 numeric, f170 numeric,
f171 numeric unsigned, f171 numeric unsigned,
f172 numeric zerofill, f172 numeric zerofill,
f173 numeric unsigned zerofill, f173 numeric unsigned zerofill,
f174 numeric (0), f174 numeric (0),
f175 numeric (64) f175 numeric (64)
) engine = innodb; ) engine = innodb;
Warnings: 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:
-------------- --------------
...@@ -88,7 +89,7 @@ Use db_drop; ...@@ -88,7 +89,7 @@ Use db_drop;
create table t1 (f1 char(30)) engine=innodb; create table t1 (f1 char(30)) engine=innodb;
grant INSERT, SELECT on db_drop.t1 to test_general; grant INSERT, SELECT on db_drop.t1 to test_general;
Use db_drop; Use db_drop;
Create trigger trg1 BEFORE INSERT on t1 Create trigger trg1 BEFORE INSERT on t1
for each row set new.f1='Trigger 3.5.4.1'; for each row set new.f1='Trigger 3.5.4.1';
Use db_drop; Use db_drop;
Insert into t1 values ('Insert error 3.5.4.1'); Insert into t1 values ('Insert error 3.5.4.1');
...@@ -127,7 +128,7 @@ drop table if exists t1_433 ; ...@@ -127,7 +128,7 @@ drop table if exists t1_433 ;
drop table if exists t1_433a ; drop table if exists t1_433a ;
create table t1_433 (f1 char (30)) engine=innodb; create table t1_433 (f1 char (30)) engine=innodb;
create table t1_433a (f1a char (5)) engine=innodb; create table t1_433a (f1a char (5)) engine=innodb;
CREATE TRIGGER trg3 BEFORE INSERT on t1_433 for each row CREATE TRIGGER trg3 BEFORE INSERT on t1_433 for each row
set new.f1 = 'Trigger 3.5.4.3'; set new.f1 = 'Trigger 3.5.4.3';
Drop trigger t1.433.trg3; Drop trigger t1.433.trg3;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.trg3' at line 1 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.trg3' at line 1
...@@ -148,7 +149,7 @@ create database db_drop4; ...@@ -148,7 +149,7 @@ create database db_drop4;
Use db_drop4; Use db_drop4;
create table t1 (f1 char(30)) engine=innodb; create table t1 (f1 char(30)) engine=innodb;
grant INSERT, SELECT on db_drop4.t1 to test_general; grant INSERT, SELECT on db_drop4.t1 to test_general;
Create trigger trg4 BEFORE INSERT on t1 Create trigger trg4 BEFORE INSERT on t1
for each row set new.f1='Trigger 3.5.4.4'; for each row set new.f1='Trigger 3.5.4.4';
Use db_drop4; Use db_drop4;
Insert into t1 values ('Insert 3.5.4.4'); Insert into t1 values ('Insert 3.5.4.4');
...@@ -184,7 +185,7 @@ create database db_drop5; ...@@ -184,7 +185,7 @@ create database db_drop5;
Use db_drop5; Use db_drop5;
create table t1 (f1 char(50)) engine=innodb; create table t1 (f1 char(50)) engine=innodb;
grant INSERT, SELECT on t1 to test_general; grant INSERT, SELECT on t1 to test_general;
Create trigger trg5 BEFORE INSERT on t1 Create trigger trg5 BEFORE INSERT on t1
for each row set new.f1='Trigger 3.5.4.5'; for each row set new.f1='Trigger 3.5.4.5';
Use db_drop5; Use db_drop5;
Insert into t1 values ('Insert 3.5.4.5'); Insert into t1 values ('Insert 3.5.4.5');
...@@ -221,7 +222,7 @@ ERROR 42S02: Table 'test.t100' doesn't exist ...@@ -221,7 +222,7 @@ ERROR 42S02: Table 'test.t100' doesn't exist
Testcase 3.5.5.2: Testcase 3.5.5.2:
----------------- -----------------
Create temporary table t1_temp (f1 bigint signed, f2 bigint unsigned); Create temporary table t1_temp (f1 bigint signed, f2 bigint unsigned);
Create trigger trg2 before INSERT Create trigger trg2 before INSERT
on t1_temp for each row set new.f2=9999; on t1_temp for each row set new.f2=9999;
ERROR HY000: Trigger's 't1_temp' is view or temporary table ERROR HY000: Trigger's 't1_temp' is view or temporary table
drop table t1_temp; drop table t1_temp;
...@@ -229,7 +230,7 @@ drop table t1_temp; ...@@ -229,7 +230,7 @@ drop table t1_temp;
Testcase 3.5.5.3: Testcase 3.5.5.3:
----------------- -----------------
Create view vw3 as select f118 from tb3; Create view vw3 as select f118 from tb3;
Create trigger trg3 before INSERT Create trigger trg3 before INSERT
on vw3 for each row set new.f118='s'; on vw3 for each row set new.f118='s';
ERROR HY000: 'test.vw3' is not BASE TABLE ERROR HY000: 'test.vw3' is not BASE TABLE
drop view vw3; drop view vw3;
...@@ -310,9 +311,9 @@ drop trigger tb3.trg4_2; ...@@ -310,9 +311,9 @@ drop trigger tb3.trg4_2;
Testcase 3.5.7.5 / 3.5.7.6: Testcase 3.5.7.5 / 3.5.7.6:
--------------------------- ---------------------------
Create trigger trg5_1 BEFORE INSERT Create trigger trg5_1 BEFORE INSERT
on tb3 for each row set new.f122='Trigger1 3.5.7.5/6'; on tb3 for each row set new.f122='Trigger1 3.5.7.5/6';
Create trigger trg5_2 BEFORE INSERT Create trigger trg5_2 BEFORE INSERT
on tb3 for each row set new.f122='Trigger2 3.5.7.5'; on tb3 for each row set new.f122='Trigger2 3.5.7.5';
ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'
Insert into tb3 (f121,f122) values ('Test 3.5.7.5/6','Insert 3.5.7.5'); Insert into tb3 (f121,f122) values ('Test 3.5.7.5/6','Insert 3.5.7.5');
...@@ -330,9 +331,9 @@ delete from tb3 where f121='Test 3.5.7.5/6'; ...@@ -330,9 +331,9 @@ delete from tb3 where f121='Test 3.5.7.5/6';
Testcase 3.5.7.7 / 3.5.7.8: Testcase 3.5.7.7 / 3.5.7.8:
--------------------------- ---------------------------
set @test_var='Before trig 3.5.7.7'; set @test_var='Before trig 3.5.7.7';
Create trigger trg6_1 AFTER INSERT Create trigger trg6_1 AFTER INSERT
on tb3 for each row set @test_var='Trigger1 3.5.7.7/8'; on tb3 for each row set @test_var='Trigger1 3.5.7.7/8';
Create trigger trg6_2 AFTER INSERT Create trigger trg6_2 AFTER INSERT
on tb3 for each row set @test_var='Trigger2 3.5.7.7'; on tb3 for each row set @test_var='Trigger2 3.5.7.7';
ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'
select @test_var; select @test_var;
...@@ -358,9 +359,9 @@ delete from tb3 where f121='Test 3.5.7.7/8'; ...@@ -358,9 +359,9 @@ delete from tb3 where f121='Test 3.5.7.7/8';
Testcase 3.5.7.9/10: Testcase 3.5.7.9/10:
-------------------- --------------------
Create trigger trg7_1 BEFORE UPDATE Create trigger trg7_1 BEFORE UPDATE
on tb3 for each row set new.f122='Trigger1 3.5.7.9/10'; on tb3 for each row set new.f122='Trigger1 3.5.7.9/10';
Create trigger trg7_2 BEFORE UPDATE Create trigger trg7_2 BEFORE UPDATE
on tb3 for each row set new.f122='Trigger2 3.5.7.9'; on tb3 for each row set new.f122='Trigger2 3.5.7.9';
ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'
Insert into tb3 (f121,f122) values ('Test 3.5.7.9/10','Insert 3.5.7.9'); Insert into tb3 (f121,f122) values ('Test 3.5.7.9/10','Insert 3.5.7.9');
...@@ -378,9 +379,9 @@ delete from tb3 where f121='Test 3.5.7.9/10'; ...@@ -378,9 +379,9 @@ delete from tb3 where f121='Test 3.5.7.9/10';
Testcase 3.5.7.11/12: Testcase 3.5.7.11/12:
--------------------- ---------------------
set @test_var='Before trig 3.5.7.11'; set @test_var='Before trig 3.5.7.11';
Create trigger trg8_1 AFTER UPDATE Create trigger trg8_1 AFTER UPDATE
on tb3 for each row set @test_var='Trigger 3.5.7.11/12'; on tb3 for each row set @test_var='Trigger 3.5.7.11/12';
Create trigger trg8_2 AFTER UPDATE Create trigger trg8_2 AFTER UPDATE
on tb3 for each row set @test_var='Trigger2 3.5.7.11'; on tb3 for each row set @test_var='Trigger2 3.5.7.11';
ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'
select @test_var; select @test_var;
...@@ -408,9 +409,9 @@ delete from tb3 where f121='Test 3.5.7.11/12'; ...@@ -408,9 +409,9 @@ delete from tb3 where f121='Test 3.5.7.11/12';
Testcase 3.5.7.13/14: Testcase 3.5.7.13/14:
--------------------- ---------------------
set @test_var=1; set @test_var=1;
Create trigger trg9_1 BEFORE DELETE Create trigger trg9_1 BEFORE DELETE
on tb3 for each row set @test_var=@test_var+1; on tb3 for each row set @test_var=@test_var+1;
Create trigger trg9_2 BEFORE DELETE Create trigger trg9_2 BEFORE DELETE
on tb3 for each row set @test_var=@test_var+10; on tb3 for each row set @test_var=@test_var+10;
ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'
select @test_var; select @test_var;
...@@ -440,12 +441,12 @@ delete from tb3 where f121='Test 3.5.7.13/14'; ...@@ -440,12 +441,12 @@ delete from tb3 where f121='Test 3.5.7.13/14';
Testcase 3.5.7.15/16: Testcase 3.5.7.15/16:
--------------------- ---------------------
set @test_var=1; set @test_var=1;
Create trigger trg_3_406010_1 AFTER DELETE Create trigger trg_3_406010_1 AFTER DELETE
on tb3 for each row set @test_var=@test_var+5; on tb3 for each row set @test_var=@test_var+5;
Create trigger trg_3_406010_2 AFTER DELETE Create trigger trg_3_406010_2 AFTER DELETE
on tb3 for each row set @test_var=@test_var+50; on tb3 for each row set @test_var=@test_var+50;
ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'
Create trigger trg_3_406010_1 AFTER INSERT Create trigger trg_3_406010_1 AFTER INSERT
on tb3 for each row set @test_var=@test_var+1; on tb3 for each row set @test_var=@test_var+1;
ERROR HY000: Trigger already exists ERROR HY000: Trigger already exists
select @test_var; select @test_var;
......
mysql-test/suite/funcs_1/r/innodb_trig_09.result
View file @ b7360593
USE test; USE test;
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',
f119 char binary not null DEFAULT b'101', f119 char binary not null DEFAULT b'101',
f120 char ascii not null DEFAULT b'101', f120 char ascii not null DEFAULT b'101',
f121 tinytext, f121 tinytext,
f122 text, f122 text,
f123 mediumtext, f123 mediumtext,
f124 longtext unicode, f124 longtext unicode,
f125 tinyblob, f125 tinyblob,
f126 blob, f126 blob,
f127 mediumblob, f127 mediumblob,
f128 longblob, f128 longblob,
f129 binary not null DEFAULT b'101', f129 binary not null DEFAULT b'101',
f130 tinyint not null DEFAULT 99, f130 tinyint not null DEFAULT 99,
f131 tinyint unsigned not null DEFAULT 99, f131 tinyint unsigned not null DEFAULT 99,
f132 tinyint zerofill not null DEFAULT 99, f132 tinyint zerofill not null DEFAULT 99,
f133 tinyint unsigned zerofill not null DEFAULT 99, f133 tinyint unsigned zerofill not null DEFAULT 99,
f134 smallint not null DEFAULT 999, f134 smallint not null DEFAULT 999,
f135 smallint unsigned not null DEFAULT 999, f135 smallint unsigned not null DEFAULT 999,
f136 smallint zerofill not null DEFAULT 999, f136 smallint zerofill not null DEFAULT 999,
f137 smallint unsigned zerofill not null DEFAULT 999, f137 smallint unsigned zerofill not null DEFAULT 999,
f138 mediumint not null DEFAULT 9999, f138 mediumint not null DEFAULT 9999,
f139 mediumint unsigned not null DEFAULT 9999, f139 mediumint unsigned not null DEFAULT 9999,
f140 mediumint zerofill not null DEFAULT 9999, f140 mediumint zerofill not null DEFAULT 9999,
f141 mediumint unsigned zerofill not null DEFAULT 9999, f141 mediumint unsigned zerofill not null DEFAULT 9999,
f142 int not null DEFAULT 99999, f142 int not null DEFAULT 99999,
f143 int unsigned not null DEFAULT 99999, f143 int unsigned not null DEFAULT 99999,
f144 int zerofill not null DEFAULT 99999, f144 int zerofill not null DEFAULT 99999,
f145 int unsigned zerofill not null DEFAULT 99999, f145 int unsigned zerofill not null DEFAULT 99999,
f146 bigint not null DEFAULT 999999, f146 bigint not null DEFAULT 999999,
f147 bigint unsigned not null DEFAULT 999999, f147 bigint unsigned not null DEFAULT 999999,
f148 bigint zerofill not null DEFAULT 999999, f148 bigint zerofill not null DEFAULT 999999,
f149 bigint unsigned zerofill not null DEFAULT 999999, f149 bigint unsigned zerofill not null DEFAULT 999999,
f150 decimal not null DEFAULT 999.999, f150 decimal not null DEFAULT 999.999,
f151 decimal unsigned not null DEFAULT 999.17, f151 decimal unsigned not null DEFAULT 999.17,
f152 decimal zerofill not null DEFAULT 999.999, f152 decimal zerofill not null DEFAULT 999.999,
f153 decimal unsigned zerofill, f153 decimal unsigned zerofill,
f154 decimal (0), f154 decimal (0),
f155 decimal (64), f155 decimal (64),
f156 decimal (0) unsigned, f156 decimal (0) unsigned,
f157 decimal (64) unsigned, f157 decimal (64) unsigned,
f158 decimal (0) zerofill, f158 decimal (0) zerofill,
f159 decimal (64) zerofill, f159 decimal (64) zerofill,
f160 decimal (0) unsigned zerofill, f160 decimal (0) unsigned zerofill,
f161 decimal (64) unsigned zerofill, f161 decimal (64) unsigned zerofill,
f162 decimal (0,0), f162 decimal (0,0),
f163 decimal (63,30), f163 decimal (63,30),
f164 decimal (0,0) unsigned, f164 decimal (0,0) unsigned,
f165 decimal (63,30) unsigned, f165 decimal (63,30) unsigned,
f166 decimal (0,0) zerofill, f166 decimal (0,0) zerofill,
f167 decimal (63,30) zerofill, f167 decimal (63,30) zerofill,
f168 decimal (0,0) unsigned zerofill, f168 decimal (0,0) unsigned zerofill,
f169 decimal (63,30) unsigned zerofill, f169 decimal (63,30) unsigned zerofill,
f170 numeric, f170 numeric,
f171 numeric unsigned, f171 numeric unsigned,
f172 numeric zerofill, f172 numeric zerofill,
f173 numeric unsigned zerofill, f173 numeric unsigned zerofill,
f174 numeric (0), f174 numeric (0),
f175 numeric (64) f175 numeric (64)
) engine = innodb; ) engine = innodb;
Warnings: 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:
------------------- -------------------
Create trigger trg1 BEFORE UPDATE on tb3 for each row Create trigger trg1 BEFORE UPDATE on tb3 for each row
set new.f142 = 94087, @counter=@counter+1; set new.f142 = 94087, @counter=@counter+1;
TotalRows TotalRows
10 10
...@@ -80,15 +81,15 @@ NewValuew ...@@ -80,15 +81,15 @@ NewValuew
0 0
set @counter=0; set @counter=0;
Update tb3 Set f142='1' where f130<100; Update tb3 Set f142='1' where f130<100;
select count(*) as ExpectedChanged, @counter as TrigCounter select count(*) as ExpectedChanged, @counter as TrigCounter
from tb3 where f142=94087; from tb3 where f142=94087;
ExpectedChanged TrigCounter ExpectedChanged TrigCounter
8 8 8 8
select count(*) as ExpectedNotChange from tb3 select count(*) as ExpectedNotChange from tb3
where f130<100 and f142<>94087; where f130<100 and f142<>94087;
ExpectedNotChange ExpectedNotChange
0 0
select count(*) as NonExpectedChanged from tb3 select count(*) as NonExpectedChanged from tb3
where f130>=130 and f142=94087; where f130>=130 and f142=94087;
NonExpectedChanged NonExpectedChanged
0 0
...@@ -116,17 +117,17 @@ set @tr_var_af_118=old.f118, @tr_var_af_121=old.f121, ...@@ -116,17 +117,17 @@ set @tr_var_af_118=old.f118, @tr_var_af_121=old.f121,
0 0 0 0 0 0 0 0 0 0
@tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_163 @tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_163
0 0 0 0 0 0 0 0 0 0
Insert into tb3 (f122, f136, f163) Insert into tb3 (f122, f136, f163)
values ('Test 3.5.9.3', 7, 123.17); values ('Test 3.5.9.3', 7, 123.17);
Update tb3 Set f136=8 where f122='Test 3.5.9.3'; Update tb3 Set f136=8 where f122='Test 3.5.9.3';
select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136; select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
f118 f121 f122 f136 f163 f118 f121 f122 f136 f163
a NULL Test 3.5.9.3 00008 123.170000000000000000000000000000 a NULL Test 3.5.9.3 00008 123.170000000000000000000000000000
select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122,
@tr_var_b4_136, @tr_var_b4_163; @tr_var_b4_136, @tr_var_b4_163;
@tr_var_b4_118 @tr_var_b4_121 @tr_var_b4_122 @tr_var_b4_136 @tr_var_b4_163 @tr_var_b4_118 @tr_var_b4_121 @tr_var_b4_122 @tr_var_b4_136 @tr_var_b4_163
a NULL Test 3.5.9.3 7 123.170000000000000000000000000000 a NULL Test 3.5.9.3 7 123.170000000000000000000000000000
select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
@tr_var_af_136, @tr_var_af_163; @tr_var_af_136, @tr_var_af_163;
@tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_163 @tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_163
a NULL Test 3.5.9.3 7 123.170000000000000000000000000000 a NULL Test 3.5.9.3 7 123.170000000000000000000000000000
...@@ -137,11 +138,11 @@ a NULL Test 3.5.9.3 7 123.170000000000000000000000000000 ...@@ -137,11 +138,11 @@ a NULL Test 3.5.9.3 7 123.170000000000000000000000000000
delete from tb3 where f122='Test 3.5.9.3'; delete from tb3 where f122='Test 3.5.9.3';
select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136; select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
f118 f121 f122 f136 f163 f118 f121 f122 f136 f163
select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122,
@tr_var_b4_136, @tr_var_b4_163; @tr_var_b4_136, @tr_var_b4_163;
@tr_var_b4_118 @tr_var_b4_121 @tr_var_b4_122 @tr_var_b4_136 @tr_var_b4_163 @tr_var_b4_118 @tr_var_b4_121 @tr_var_b4_122 @tr_var_b4_136 @tr_var_b4_163
a NULL Test 3.5.9.3 8 123.170000000000000000000000000000 a NULL Test 3.5.9.3 8 123.170000000000000000000000000000
select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
@tr_var_af_136, @tr_var_af_163; @tr_var_af_136, @tr_var_af_163;
@tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_163 @tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_163
a NULL Test 3.5.9.3 8 123.170000000000000000000000000000 a NULL Test 3.5.9.3 8 123.170000000000000000000000000000
...@@ -172,17 +173,17 @@ set @tr_var_af_118=new.f118, @tr_var_af_121=new.f121, ...@@ -172,17 +173,17 @@ set @tr_var_af_118=new.f118, @tr_var_af_121=new.f121,
0 0 0 0 0 0 0 0 0 0 0 0
@tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_151 @tr_var_af_163 @tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_151 @tr_var_af_163
0 0 0 0 0 0 0 0 0 0 0 0
Insert into tb3 (f122, f136, f151, f163) Insert into tb3 (f122, f136, f151, f163)
values ('Test 3.5.9.4', 7, DEFAULT, 995.24); values ('Test 3.5.9.4', 7, DEFAULT, 995.24);
select f118, f121, f122, f136, f151, f163 from tb3 select f118, f121, f122, f136, f151, f163 from tb3
where f122 like 'Test 3.5.9.4%' order by f163; where f122 like 'Test 3.5.9.4%' order by f163;
f118 f121 f122 f136 f151 f163 f118 f121 f122 f136 f151 f163
a NULL Test 3.5.9.4 00007 999 995.240000000000000000000000000000 a NULL Test 3.5.9.4 00007 999 995.240000000000000000000000000000
select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122,
@tr_var_b4_136, @tr_var_b4_151, @tr_var_b4_163; @tr_var_b4_136, @tr_var_b4_151, @tr_var_b4_163;
@tr_var_b4_118 @tr_var_b4_121 @tr_var_b4_122 @tr_var_b4_136 @tr_var_b4_151 @tr_var_b4_163 @tr_var_b4_118 @tr_var_b4_121 @tr_var_b4_122 @tr_var_b4_136 @tr_var_b4_151 @tr_var_b4_163
a NULL Test 3.5.9.4 7 999 995.240000000000000000000000000000 a NULL Test 3.5.9.4 7 999 995.240000000000000000000000000000
select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
@tr_var_af_136, @tr_var_af_151, @tr_var_af_163; @tr_var_af_136, @tr_var_af_151, @tr_var_af_163;
@tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_151 @tr_var_af_163 @tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_151 @tr_var_af_163
a NULL Test 3.5.9.4 7 999 995.240000000000000000000000000000 a NULL Test 3.5.9.4 7 999 995.240000000000000000000000000000
...@@ -195,15 +196,15 @@ where f122='Test 3.5.9.4'; ...@@ -195,15 +196,15 @@ where f122='Test 3.5.9.4';
ERROR 23000: Column 'f136' cannot be null ERROR 23000: Column 'f136' cannot be null
Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
where f122='Test 3.5.9.4'; where f122='Test 3.5.9.4';
select f118, f121, f122, f136, f151, f163 from tb3 select f118, f121, f122, f136, f151, f163 from tb3
where f122 like 'Test 3.5.9.4-trig' order by f163; where f122 like 'Test 3.5.9.4-trig' order by f163;
f118 f121 f122 f136 f151 f163 f118 f121 f122 f136 f151 f163
a NULL Test 3.5.9.4-trig 00000 999 NULL a NULL Test 3.5.9.4-trig 00000 999 NULL
select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122,
@tr_var_b4_136, @tr_var_b4_151, @tr_var_b4_163; @tr_var_b4_136, @tr_var_b4_151, @tr_var_b4_163;
@tr_var_b4_118 @tr_var_b4_121 @tr_var_b4_122 @tr_var_b4_136 @tr_var_b4_151 @tr_var_b4_163 @tr_var_b4_118 @tr_var_b4_121 @tr_var_b4_122 @tr_var_b4_136 @tr_var_b4_151 @tr_var_b4_163
a NULL Test 3.5.9.4-trig 0 999 NULL a NULL Test 3.5.9.4-trig 0 999 NULL
select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
@tr_var_af_136, @tr_var_af_151, @tr_var_af_163; @tr_var_af_136, @tr_var_af_151, @tr_var_af_163;
@tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_151 @tr_var_af_163 @tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_151 @tr_var_af_163
a NULL Test 3.5.9.4-trig 0 999 NULL a NULL Test 3.5.9.4-trig 0 999 NULL
...@@ -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 @ b7360593
USE test; USE test;
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',
f119 char binary not null DEFAULT b'101', f119 char binary not null DEFAULT b'101',
f120 char ascii not null DEFAULT b'101', f120 char ascii not null DEFAULT b'101',
f121 tinytext, f121 tinytext,
f122 text, f122 text,
f123 mediumtext, f123 mediumtext,
f124 longtext unicode, f124 longtext unicode,
f125 tinyblob, f125 tinyblob,
f126 blob, f126 blob,
f127 mediumblob, f127 mediumblob,
f128 longblob, f128 longblob,
f129 binary not null DEFAULT b'101', f129 binary not null DEFAULT b'101',
f130 tinyint not null DEFAULT 99, f130 tinyint not null DEFAULT 99,
f131 tinyint unsigned not null DEFAULT 99, f131 tinyint unsigned not null DEFAULT 99,
f132 tinyint zerofill not null DEFAULT 99, f132 tinyint zerofill not null DEFAULT 99,
f133 tinyint unsigned zerofill not null DEFAULT 99, f133 tinyint unsigned zerofill not null DEFAULT 99,
f134 smallint not null DEFAULT 999, f134 smallint not null DEFAULT 999,
f135 smallint unsigned not null DEFAULT 999, f135 smallint unsigned not null DEFAULT 999,
f136 smallint zerofill not null DEFAULT 999, f136 smallint zerofill not null DEFAULT 999,
f137 smallint unsigned zerofill not null DEFAULT 999, f137 smallint unsigned zerofill not null DEFAULT 999,
f138 mediumint not null DEFAULT 9999, f138 mediumint not null DEFAULT 9999,
f139 mediumint unsigned not null DEFAULT 9999, f139 mediumint unsigned not null DEFAULT 9999,
f140 mediumint zerofill not null DEFAULT 9999, f140 mediumint zerofill not null DEFAULT 9999,
f141 mediumint unsigned zerofill not null DEFAULT 9999, f141 mediumint unsigned zerofill not null DEFAULT 9999,
f142 int not null DEFAULT 99999, f142 int not null DEFAULT 99999,
f143 int unsigned not null DEFAULT 99999, f143 int unsigned not null DEFAULT 99999,
f144 int zerofill not null DEFAULT 99999, f144 int zerofill not null DEFAULT 99999,
f145 int unsigned zerofill not null DEFAULT 99999, f145 int unsigned zerofill not null DEFAULT 99999,
f146 bigint not null DEFAULT 999999, f146 bigint not null DEFAULT 999999,
f147 bigint unsigned not null DEFAULT 999999, f147 bigint unsigned not null DEFAULT 999999,
f148 bigint zerofill not null DEFAULT 999999, f148 bigint zerofill not null DEFAULT 999999,
f149 bigint unsigned zerofill not null DEFAULT 999999, f149 bigint unsigned zerofill not null DEFAULT 999999,
f150 decimal not null DEFAULT 999.999, f150 decimal not null DEFAULT 999.999,
f151 decimal unsigned not null DEFAULT 999.17, f151 decimal unsigned not null DEFAULT 999.17,
f152 decimal zerofill not null DEFAULT 999.999, f152 decimal zerofill not null DEFAULT 999.999,
f153 decimal unsigned zerofill, f153 decimal unsigned zerofill,
f154 decimal (0), f154 decimal (0),
f155 decimal (64), f155 decimal (64),
f156 decimal (0) unsigned, f156 decimal (0) unsigned,
f157 decimal (64) unsigned, f157 decimal (64) unsigned,
f158 decimal (0) zerofill, f158 decimal (0) zerofill,
f159 decimal (64) zerofill, f159 decimal (64) zerofill,
f160 decimal (0) unsigned zerofill, f160 decimal (0) unsigned zerofill,
f161 decimal (64) unsigned zerofill, f161 decimal (64) unsigned zerofill,
f162 decimal (0,0), f162 decimal (0,0),
f163 decimal (63,30), f163 decimal (63,30),
f164 decimal (0,0) unsigned, f164 decimal (0,0) unsigned,
f165 decimal (63,30) unsigned, f165 decimal (63,30) unsigned,
f166 decimal (0,0) zerofill, f166 decimal (0,0) zerofill,
f167 decimal (63,30) zerofill, f167 decimal (63,30) zerofill,
f168 decimal (0,0) unsigned zerofill, f168 decimal (0,0) unsigned zerofill,
f169 decimal (63,30) unsigned zerofill, f169 decimal (63,30) unsigned zerofill,
f170 numeric, f170 numeric,
f171 numeric unsigned, f171 numeric unsigned,
f172 numeric zerofill, f172 numeric zerofill,
f173 numeric unsigned zerofill, f173 numeric unsigned zerofill,
f174 numeric (0), f174 numeric (0),
f175 numeric (64) f175 numeric (64)
) engine = innodb; ) engine = innodb;
Warnings: 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/is_columns_ndb.result
View file @ b7360593
...@@ -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/ndb_views.result
View file @ b7360593
This diff is collapsed.
mysql-test/suite/funcs_1/t/is_engines.test
View file @ b7360593
This diff is collapsed.
mysql-test/suite/funcs_1/t/ndb_trig_03.test
View file @ b7360593
This diff is collapsed.
mysql-test/suite/funcs_1/t/ndb_trig_08.test
View file @ b7360593
This diff is collapsed.
mysql-test/suite/funcs_1/t/ndb_views.test
View file @ b7360593
This diff is collapsed.
mysql-test/suite/funcs_1/t/suite.opt
View file @ b7360593
This diff is collapsed.
mysql-test/suite/funcs_1/triggers/triggers_master.test deleted 100644 → 0
View file @ 013fd236
This diff is collapsed.
mysql-test/suite/rpl/t/disabled.def
View file @ b7360593
This diff is collapsed.
mysql-test/t/type_blob.test
View file @ b7360593
This diff is collapsed.
sql-common/my_time.c
View file @ b7360593
This diff is collapsed.
sql/field.cc
View file @ b7360593
This diff is collapsed.
sql/init.cc
View file @ b7360593
This diff is collapsed.
sql/item_create.cc
View file @ b7360593
This diff is collapsed.
sql/share/errmsg.txt
View file @ b7360593
This diff is collapsed.
sql/sql_yacc.yy
View file @ b7360593
This diff is collapsed.
sql/tztime.cc
View file @ b7360593
This diff is collapsed.
sql/unireg.h
View file @ b7360593
This diff is collapsed.
support-files/mysql.spec.sh
View file @ b7360593
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