diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-08-09 17:22:00 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-09 17:22:00 +0200 |
commit | d11829654c4ef5c3d0f997ca61a50d4bd196db8a (patch) | |
tree | e48a5775e961b17600bf9c1c189243deb5515ba7 /mysql-test/suite/funcs_1/r/myisam_views-big.result | |
parent | e022b6ef07529d83e8c1cbd5e3d374fc5cc75721 (diff) | |
parent | 704898bf3200af4da42c1bf9251a7da5533db73f (diff) | |
download | mariadb-git-d11829654c4ef5c3d0f997ca61a50d4bd196db8a.tar.gz |
merge with MySQL 5.5.27
manually checked every change, reverted incorrect or stupid changes.
Diffstat (limited to 'mysql-test/suite/funcs_1/r/myisam_views-big.result')
-rw-r--r-- | mysql-test/suite/funcs_1/r/myisam_views-big.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/suite/funcs_1/r/myisam_views-big.result b/mysql-test/suite/funcs_1/r/myisam_views-big.result index f4025dfef2a..1ee9c6e0cd6 100644 --- a/mysql-test/suite/funcs_1/r/myisam_views-big.result +++ b/mysql-test/suite/funcs_1/r/myisam_views-big.result @@ -62,6 +62,8 @@ f115 VARBINARY(27) null , f116 VARBINARY(64) null, f117 VARBINARY(192) null ) engine = myisam; +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/myisam_tb2.txt' into table tb2; DROP DATABASE IF EXISTS test1; @@ -129,6 +131,8 @@ f115 VARBINARY(27) null , f116 VARBINARY(64) null, f117 VARBINARY(192) null ) engine = myisam; +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/myisam_tb2.txt' into table tb2; USE test; |