diff options
| author | Gleb Shchepa <gleb.shchepa@oracle.com> | 2012-06-29 14:12:21 +0400 |
|---|---|---|
| committer | Gleb Shchepa <gleb.shchepa@oracle.com> | 2012-06-29 14:12:21 +0400 |
| commit | 4661d95433b2b6f4c7f25facd2a45db23329dcba (patch) | |
| tree | aa3c60456b0b32facebea115b86bbc0b63d1aa9d /mysql-test/suite/funcs_1/r/is_columns_memory.result | |
| parent | 6058319dba910576e00b0b566697b95aff6cb52c (diff) | |
| parent | 767501fb54f19adf3c136e5131daf11e34b3f039 (diff) | |
| download | mariadb-git-4661d95433b2b6f4c7f25facd2a45db23329dcba.tar.gz | |
manual merge (WL6219)
sql/sql_yacc.yy:
manual merge (backport of WL6219)
Diffstat (limited to 'mysql-test/suite/funcs_1/r/is_columns_memory.result')
| -rw-r--r-- | mysql-test/suite/funcs_1/r/is_columns_memory.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/suite/funcs_1/r/is_columns_memory.result b/mysql-test/suite/funcs_1/r/is_columns_memory.result index 8cb865e68db..26d236a0064 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_memory.result +++ b/mysql-test/suite/funcs_1/r/is_columns_memory.result @@ -128,6 +128,8 @@ f107 year(4) not null default 2000, f108 enum("1enum","2enum") not null default "1enum", f109 set("1set","2set") not null default "1set" ) engine = memory; +Warnings: +Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/memory_tb2.txt' into table tb2 ; drop table if exists tb3; @@ -251,6 +253,8 @@ f238 varchar(25000) binary, f239 varbinary(0), f240 varchar(1200) ) engine = memory; +Warnings: +Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/memory_tb4.txt' into table tb4; USE test1; @@ -308,6 +312,8 @@ f107 year(4) not null default 2000, f108 enum("1enum","2enum") not null default "1enum", f109 set("1set","2set") not null default "1set" ) engine = memory; +Warnings: +Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/memory_tb2.txt' into table tb2 ; USE test; |