List:Commits« Previous MessageNext Message »
From:Magne Mahre Date:February 8 2010 9:11pm
Subject:bzr commit into mysql-5.1-bugteam branch (magne.mahre:3372) Bug#47974
View as plain text  
#At file:///data/z/mysql-5.1-bugteam-47974/ based on revid:luis.soares@stripped

 3372 Magne Mahre	2010-02-08
      Bug#47974 'TYPE=storage_engine' is deprecated and will be 
                removed in MySQL 6.0
      
      CREATE TABLE... TYPE= returns the warning "The syntax 
      'TYPE=storage_engine' is deprecated and will be removed in 
      MySQL 6.0. Please use 'ENGINE=storage_engine' instead" 
      
      This syntax is deprecated already from version 5.4.4, so
      the message has been changed.
      
      In addition, the deprecation macro was changed to reflect
      the ServerPT decision not to include version number in the
      warning message.
      
      A number of test result files have been changed as a
      consequence of the change in the deprecation macro.

    modified:
      mysql-test/r/backup.result
      mysql-test/r/func_time.result
      mysql-test/r/log_state.result
      mysql-test/r/show_check.result
      mysql-test/r/sp-error.result
      mysql-test/r/sp.result
      mysql-test/r/sp_trans.result
      mysql-test/r/type_blob.result
      mysql-test/r/type_timestamp.result
      mysql-test/r/warnings.result
      sql/mysql_priv.h
      sql/share/errmsg.txt
      sql/sql_yacc.yy
=== modified file 'mysql-test/r/backup.result'
--- a/mysql-test/r/backup.result	2009-02-16 11:38:15 +0000
+++ b/mysql-test/r/backup.result	2010-02-08 21:10:55 +0000
@@ -4,23 +4,23 @@ create table t4(n int);
 backup table t4 to '../../bogus';
 Table	Op	Msg_type	Msg_text
 test.t4	backup	error	Failed copying .frm file (errno: X)
-test.t4	backup	Warning	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.0. Please use MySQL Administrator (mysqldump, mysql) instead
+test.t4	backup	Warning	'BACKUP TABLE' is deprecated and will be removed in a future version. Please use 'MySQL Administrator (mysqldump, mysql)' instead
 test.t4	backup	Error	Can't create/write to file 'MYSQLTEST_VARDIR/bogus/t4.frm' (Errcode: X)
 test.t4	backup	status	Operation failed
 backup table t4 to '../../tmp';
 Table	Op	Msg_type	Msg_text
-test.t4	backup	Warning	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.0. Please use MySQL Administrator (mysqldump, mysql) instead
+test.t4	backup	Warning	'BACKUP TABLE' is deprecated and will be removed in a future version. Please use 'MySQL Administrator (mysqldump, mysql)' instead
 test.t4	backup	status	OK
 backup table t4 to '../../tmp';
 Table	Op	Msg_type	Msg_text
 test.t4	backup	error	Failed copying .frm file (errno: X)
-test.t4	backup	Warning	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.0. Please use MySQL Administrator (mysqldump, mysql) instead
+test.t4	backup	Warning	'BACKUP TABLE' is deprecated and will be removed in a future version. Please use 'MySQL Administrator (mysqldump, mysql)' instead
 test.t4	backup	Error	Can't create/write to file 'MYSQLTEST_VARDIR/tmp/t4.frm' (Errcode: X)
 test.t4	backup	status	Operation failed
 drop table t4;
 restore table t4 from '../../tmp';
 Table	Op	Msg_type	Msg_text
-test.t4	restore	Warning	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 6.0. Please use MySQL Administrator (mysqldump, mysql) instead
+test.t4	restore	Warning	'RESTORE TABLE' is deprecated and will be removed in a future version. Please use 'MySQL Administrator (mysqldump, mysql)' instead
 test.t4	restore	status	OK
 select count(*) from t4;
 count(*)
@@ -29,18 +29,18 @@ create table t1(n int);
 insert into t1 values (23),(45),(67);
 backup table t1 to '../../tmp';
 Table	Op	Msg_type	Msg_text
-test.t1	backup	Warning	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.0. Please use MySQL Administrator (mysqldump, mysql) instead
+test.t1	backup	Warning	'BACKUP TABLE' is deprecated and will be removed in a future version. Please use 'MySQL Administrator (mysqldump, mysql)' instead
 test.t1	backup	status	OK
 drop table t1;
 restore table t1 from '../../bogus';
 Table	Op	Msg_type	Msg_text
 t1	restore	error	Failed copying .frm file
 Warnings:
-Warning	1287	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 6.0. Please use MySQL Administrator (mysqldump, mysql) instead
+Warning	1287	'RESTORE TABLE' is deprecated and will be removed in a future version. Please use 'MySQL Administrator (mysqldump, mysql)' instead
 Error	29	File 'MYSQLTEST_VARDIR/bogus/t1.frm' not found (Errcode: X)
 restore table t1 from '../../tmp';
 Table	Op	Msg_type	Msg_text
-test.t1	restore	Warning	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 6.0. Please use MySQL Administrator (mysqldump, mysql) instead
+test.t1	restore	Warning	'RESTORE TABLE' is deprecated and will be removed in a future version. Please use 'MySQL Administrator (mysqldump, mysql)' instead
 test.t1	restore	status	OK
 select n from t1;
 n
@@ -53,13 +53,13 @@ insert into t2 values (123),(145),(167);
 insert into t3 values (223),(245),(267);
 backup table t2,t3 to '../../tmp';
 Table	Op	Msg_type	Msg_text
-test.t2	backup	Warning	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.0. Please use MySQL Administrator (mysqldump, mysql) instead
+test.t2	backup	Warning	'BACKUP TABLE' is deprecated and will be removed in a future version. Please use 'MySQL Administrator (mysqldump, mysql)' instead
 test.t2	backup	status	OK
 test.t3	backup	status	OK
 drop table t1,t2,t3;
 restore table t1,t2,t3 from '../../tmp';
 Table	Op	Msg_type	Msg_text
-test.t1	restore	Warning	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 6.0. Please use MySQL Administrator (mysqldump, mysql) instead
+test.t1	restore	Warning	'RESTORE TABLE' is deprecated and will be removed in a future version. Please use 'MySQL Administrator (mysqldump, mysql)' instead
 test.t1	restore	status	OK
 test.t2	restore	status	OK
 test.t3	restore	status	OK
@@ -81,14 +81,14 @@ k
 drop table t1,t2,t3,t4;
 restore table t1 from '../../tmp';
 Table	Op	Msg_type	Msg_text
-test.t1	restore	Warning	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 6.0. Please use MySQL Administrator (mysqldump, mysql) instead
+test.t1	restore	Warning	'RESTORE TABLE' is deprecated and will be removed in a future version. Please use 'MySQL Administrator (mysqldump, mysql)' instead
 test.t1	restore	status	OK
 rename table t1 to t5;
 lock tables t5 write;
 backup table t5 to '../../tmp';
 unlock tables;
 Table	Op	Msg_type	Msg_text
-test.t5	backup	Warning	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.0. Please use MySQL Administrator (mysqldump, mysql) instead
+test.t5	backup	Warning	'BACKUP TABLE' is deprecated and will be removed in a future version. Please use 'MySQL Administrator (mysqldump, mysql)' instead
 test.t5	backup	status	OK
 drop table t5;
 DROP TABLE IF EXISTS `t+1`;
@@ -96,12 +96,12 @@ CREATE  TABLE `t+1` (c1 INT);
 INSERT  INTO  `t+1` VALUES (1), (2), (3);
 BACKUP  TABLE `t+1` TO '../../tmp';
 Table	Op	Msg_type	Msg_text
-test.t+1	backup	Warning	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.0. Please use MySQL Administrator (mysqldump, mysql) instead
+test.t+1	backup	Warning	'BACKUP TABLE' is deprecated and will be removed in a future version. Please use 'MySQL Administrator (mysqldump, mysql)' instead
 test.t+1	backup	status	OK
 DROP    TABLE `t+1`;
 RESTORE TABLE `t+1` FROM '../../tmp';
 Table	Op	Msg_type	Msg_text
-test.t+1	restore	Warning	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 6.0. Please use MySQL Administrator (mysqldump, mysql) instead
+test.t+1	restore	Warning	'RESTORE TABLE' is deprecated and will be removed in a future version. Please use 'MySQL Administrator (mysqldump, mysql)' instead
 test.t+1	restore	status	OK
 SELECT * FROM `t+1`;
 c1

=== modified file 'mysql-test/r/func_time.result'
--- a/mysql-test/r/func_time.result	2010-01-21 08:10:05 +0000
+++ b/mysql-test/r/func_time.result	2010-02-08 21:10:55 +0000
@@ -682,7 +682,7 @@ select timestampadd(SQL_TSI_FRAC_SECOND,
 timestampadd(SQL_TSI_FRAC_SECOND, 1, date)
 2003-01-02 00:00:00.000001
 Warnings:
-Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 5.6. Please use MICROSECOND instead
+Warning	1287	'FRAC_SECOND' is deprecated and will be removed in a future version. Please use 'MICROSECOND' instead
 select timestampdiff(MONTH, '2001-02-01', '2001-05-01') as a;
 a
 3
@@ -717,7 +717,7 @@ select timestampdiff(SQL_TSI_FRAC_SECOND
 a
 7689538999999
 Warnings:
-Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 5.6. Please use MICROSECOND instead
+Warning	1287	'FRAC_SECOND' is deprecated and will be removed in a future version. Please use 'MICROSECOND' instead
 select timestampdiff(SQL_TSI_DAY, '1986-02-01', '1986-03-01') as a1,
 timestampdiff(SQL_TSI_DAY, '1900-02-01', '1900-03-01') as a2,
 timestampdiff(SQL_TSI_DAY, '1996-02-01', '1996-03-01') as a3,
@@ -1088,7 +1088,7 @@ timestampdiff(SQL_TSI_FRAC_SECOND, '2001
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
-Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 5.6. Please use MICROSECOND instead
+Warning	1287	'FRAC_SECOND' is deprecated and will be removed in a future version. Please use 'MICROSECOND' instead
 Note	1003	select timestampdiff(WEEK,'2001-02-01','2001-05-01') AS `a1`,timestampdiff(SECOND_FRAC,'2001-02-01 12:59:59.120000','2001-05-01 12:58:58.119999') AS `a2`
 select time_format('100:00:00', '%H %k %h %I %l');
 time_format('100:00:00', '%H %k %h %I %l')
@@ -1287,12 +1287,12 @@ SELECT TIMESTAMPADD(FRAC_SECOND, 1, '200
 TIMESTAMPADD(FRAC_SECOND, 1, '2008-02-18')
 2008-02-18 00:00:00.000001
 Warnings:
-Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 5.6. Please use MICROSECOND instead
+Warning	1287	'FRAC_SECOND' is deprecated and will be removed in a future version. Please use 'MICROSECOND' instead
 SELECT TIMESTAMPDIFF(FRAC_SECOND, '2008-02-17', '2008-02-18');
 TIMESTAMPDIFF(FRAC_SECOND, '2008-02-17', '2008-02-18')
 86400000000
 Warnings:
-Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 5.6. Please use MICROSECOND instead
+Warning	1287	'FRAC_SECOND' is deprecated and will be removed in a future version. Please use 'MICROSECOND' instead
 SELECT DATE_ADD('2008-02-18', INTERVAL 1 FRAC_SECOND);
 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 'FRAC_SECOND)' at line 1
 SELECT DATE_SUB('2008-02-18', INTERVAL 1 FRAC_SECOND);

=== modified file 'mysql-test/r/log_state.result'
--- a/mysql-test/r/log_state.result	2009-01-23 12:22:05 +0000
+++ b/mysql-test/r/log_state.result	2010-02-08 21:10:55 +0000
@@ -199,7 +199,7 @@ SELECT @@general_log, @@log;
 1	1
 SET GLOBAL log = 0;
 Warnings:
-Warning	1287	The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead
+Warning	1287	'@@log' is deprecated and will be removed in a future version; use ''@@general_log'' instead
 SHOW VARIABLES LIKE 'general_log';
 Variable_name	Value
 general_log	OFF
@@ -230,7 +230,7 @@ SELECT @@slow_query_log, @@log_slow_quer
 0	0
 SET GLOBAL log_slow_queries = 0;
 Warnings:
-Warning	1287	The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead
+Warning	1287	'@@log_slow_queries' is deprecated and will be removed in a future version; use ''@@slow_query_log'' instead
 SHOW VARIABLES LIKE 'slow_query_log';
 Variable_name	Value
 slow_query_log	OFF
@@ -283,16 +283,16 @@ SET GLOBAL slow_query_log_file = @old_sl
 deprecated:
 SET GLOBAL log = 0;
 Warnings:
-Warning	1287	The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead
+Warning	1287	'@@log' is deprecated and will be removed in a future version; use ''@@general_log'' instead
 SET GLOBAL log_slow_queries = 0;
 Warnings:
-Warning	1287	The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead
+Warning	1287	'@@log_slow_queries' is deprecated and will be removed in a future version; use ''@@slow_query_log'' instead
 SET GLOBAL log = DEFAULT;
 Warnings:
-Warning	1287	The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead
+Warning	1287	'@@log' is deprecated and will be removed in a future version; use ''@@general_log'' instead
 SET GLOBAL log_slow_queries = DEFAULT;
 Warnings:
-Warning	1287	The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead
+Warning	1287	'@@log_slow_queries' is deprecated and will be removed in a future version; use ''@@slow_query_log'' instead
 not deprecated:
 SELECT @@global.general_log_file INTO @my_glf;
 SELECT @@global.slow_query_log_file INTO @my_sqlf;

=== modified file 'mysql-test/r/show_check.result'
--- a/mysql-test/r/show_check.result	2010-01-13 10:28:42 +0000
+++ b/mysql-test/r/show_check.result	2010-02-08 21:10:55 +0000
@@ -1295,7 +1295,7 @@ drop database mysqltest;
 show full plugin;
 show warnings;
 Level	Code	Message
-Warning	1287	The syntax 'SHOW PLUGIN' is deprecated and will be removed in MySQL 6.0. Please use 'SHOW PLUGINS' instead
+Warning	1287	'SHOW PLUGIN' is deprecated and will be removed in a future version. Please use ''SHOW PLUGINS'' instead
 show plugin;
 show plugins;
 create database `mysqlttest\1`;

=== modified file 'mysql-test/r/sp-error.result'
--- a/mysql-test/r/sp-error.result	2009-12-08 09:26:11 +0000
+++ b/mysql-test/r/sp-error.result	2010-02-08 21:10:55 +0000
@@ -1643,7 +1643,7 @@ create table t1 (a int) type=MyISAM;
 drop table t1;
 end|
 Warnings:
-Warning	1287	The syntax 'TYPE=storage_engine' is deprecated and will be removed in MySQL 6.0. Please use 'ENGINE=storage_engine' instead
+Warning	1287	'TYPE=storage_engine' is deprecated and will be removed in a future version. Please use ''ENGINE=storage_engine'' instead
 call p1();
 call p1();
 drop procedure p1;

=== modified file 'mysql-test/r/sp.result'
--- a/mysql-test/r/sp.result	2009-12-23 13:44:03 +0000
+++ b/mysql-test/r/sp.result	2010-02-08 21:10:55 +0000
@@ -4304,10 +4304,10 @@ call bug13012()|
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 Table	Op	Msg_type	Msg_text
-test.t1	backup	Warning	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.0. Please use MySQL Administrator (mysqldump, mysql) instead
+test.t1	backup	Warning	'BACKUP TABLE' is deprecated and will be removed in a future version. Please use 'MySQL Administrator (mysqldump, mysql)' instead
 test.t1	backup	status	OK
 Table	Op	Msg_type	Msg_text
-test.t1	restore	Warning	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 6.0. Please use MySQL Administrator (mysqldump, mysql) instead
+test.t1	restore	Warning	'RESTORE TABLE' is deprecated and will be removed in a future version. Please use 'MySQL Administrator (mysqldump, mysql)' instead
 test.t1	restore	status	OK
 drop procedure bug13012|
 create view v1 as select * from t1|

=== modified file 'mysql-test/r/sp_trans.result'
--- a/mysql-test/r/sp_trans.result	2009-02-16 11:38:15 +0000
+++ b/mysql-test/r/sp_trans.result	2010-02-08 21:10:55 +0000
@@ -535,7 +535,7 @@ use db_bug7787|
 CREATE PROCEDURE p1()
 SHOW INNODB STATUS; |
 Warnings:
-Warning	1287	The syntax 'SHOW INNODB STATUS' is deprecated and will be removed in MySQL 6.0. Please use 'SHOW ENGINE INNODB STATUS' instead
+Warning	1287	'SHOW INNODB STATUS' is deprecated and will be removed in a future version. Please use ''SHOW ENGINE INNODB STATUS'' instead
 GRANT EXECUTE ON PROCEDURE p1 TO user_bug7787@localhost|
 DROP DATABASE db_bug7787|
 drop user user_bug7787@localhost|

=== modified file 'mysql-test/r/type_blob.result'
--- a/mysql-test/r/type_blob.result	2009-02-16 11:38:15 +0000
+++ b/mysql-test/r/type_blob.result	2010-02-08 21:10:55 +0000
@@ -891,11 +891,11 @@ 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 6.0. Please use 'TIMESTAMP' instead
+Warning	1287	'TIMESTAMP(4294967294)' is deprecated and will be removed in a future version. Please use ''TIMESTAMP'' instead
 DROP TABLE b15776;
 CREATE TABLE b15776 (a timestamp(4294967295));
 Warnings:
-Warning	1287	The syntax 'TIMESTAMP(4294967295)' is deprecated and will be removed in MySQL 6.0. Please use 'TIMESTAMP' instead
+Warning	1287	'TIMESTAMP(4294967295)' is deprecated and will be removed in a future version. Please use ''TIMESTAMP'' instead
 DROP TABLE b15776;
 CREATE TABLE b15776 (a timestamp(4294967296));
 ERROR 42000: Display width out of range for column 'a' (max = 4294967295)

=== modified file 'mysql-test/r/type_timestamp.result'
--- a/mysql-test/r/type_timestamp.result	2009-02-16 11:38:15 +0000
+++ b/mysql-test/r/type_timestamp.result	2010-02-08 21:10:55 +0000
@@ -101,13 +101,13 @@ create table t1 (t2 timestamp(2), t4 tim
 t8 timestamp(8), t10 timestamp(10), t12 timestamp(12),
 t14 timestamp(14));
 Warnings:
-Warning	1287	The syntax 'TIMESTAMP(2)' is deprecated and will be removed in MySQL 6.0. Please use 'TIMESTAMP' instead
-Warning	1287	The syntax 'TIMESTAMP(4)' is deprecated and will be removed in MySQL 6.0. Please use 'TIMESTAMP' instead
-Warning	1287	The syntax 'TIMESTAMP(6)' is deprecated and will be removed in MySQL 6.0. Please use 'TIMESTAMP' instead
-Warning	1287	The syntax 'TIMESTAMP(8)' is deprecated and will be removed in MySQL 6.0. Please use 'TIMESTAMP' instead
-Warning	1287	The syntax 'TIMESTAMP(10)' is deprecated and will be removed in MySQL 6.0. Please use 'TIMESTAMP' instead
-Warning	1287	The syntax 'TIMESTAMP(12)' is deprecated and will be removed in MySQL 6.0. Please use 'TIMESTAMP' instead
-Warning	1287	The syntax 'TIMESTAMP(14)' is deprecated and will be removed in MySQL 6.0. Please use 'TIMESTAMP' instead
+Warning	1287	'TIMESTAMP(2)' is deprecated and will be removed in a future version. Please use ''TIMESTAMP'' instead
+Warning	1287	'TIMESTAMP(4)' is deprecated and will be removed in a future version. Please use ''TIMESTAMP'' instead
+Warning	1287	'TIMESTAMP(6)' is deprecated and will be removed in a future version. Please use ''TIMESTAMP'' instead
+Warning	1287	'TIMESTAMP(8)' is deprecated and will be removed in a future version. Please use ''TIMESTAMP'' instead
+Warning	1287	'TIMESTAMP(10)' is deprecated and will be removed in a future version. Please use ''TIMESTAMP'' instead
+Warning	1287	'TIMESTAMP(12)' is deprecated and will be removed in a future version. Please use ''TIMESTAMP'' instead
+Warning	1287	'TIMESTAMP(14)' is deprecated and will be removed in a future version. Please use ''TIMESTAMP'' instead
 insert t1 values (0,0,0,0,0,0,0),
 ("1997-12-31 23:47:59", "1997-12-31 23:47:59", "1997-12-31 23:47:59",
 "1997-12-31 23:47:59", "1997-12-31 23:47:59", "1997-12-31 23:47:59",

=== modified file 'mysql-test/r/warnings.result'
--- a/mysql-test/r/warnings.result	2009-09-10 08:49:49 +0000
+++ b/mysql-test/r/warnings.result	2010-02-08 21:10:55 +0000
@@ -168,7 +168,7 @@ max_error_count	10
 drop table t1;
 set table_type=MYISAM;
 Warnings:
-Warning	1287	The syntax '@@table_type' is deprecated and will be removed in MySQL 6.0. Please use '@@storage_engine' instead
+Warning	1287	'@@table_type' is deprecated and will be removed in a future version. Please use ''@@storage_engine'' instead
 create table t1 (a int);
 insert into t1 (a) values (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
 update t1 set a='abc';

=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h	2010-02-06 19:54:30 +0000
+++ b/sql/mysql_priv.h	2010-02-08 21:10:55 +0000
@@ -118,10 +118,11 @@ char* query_table_status(THD *thd,const 
 #define WARN_DEPRECATED(Thd,Ver,Old,New)                                             \
   do {                                                                               \
     DBUG_ASSERT(strncmp(Ver, MYSQL_SERVER_VERSION, sizeof(Ver)-1) > 0);              \
-    if (((uchar*)Thd) != NULL)                                                         \
+    if (((uchar*)Thd) != NULL)                                                       \
       push_warning_printf(((THD *)Thd), MYSQL_ERROR::WARN_LEVEL_WARN,                \
-                        ER_WARN_DEPRECATED_SYNTAX, ER(ER_WARN_DEPRECATED_SYNTAX_WITH_VER), \
-                        (Old), (Ver), (New));                                        \
+                        ER_WARN_DEPRECATED_SYNTAX,                                   \
+                        ER(ER_WARN_DEPRECATED_SYNTAX),                               \
+                        (Old), (New));                                               \
     else                                                                             \
       sql_print_warning("The syntax '%s' is deprecated and will be removed "         \
                         "in a future release. Please use %s instead.", (Old), (New)); \

=== modified file 'sql/share/errmsg.txt'
--- a/sql/share/errmsg.txt	2010-01-21 08:10:05 +0000
+++ b/sql/share/errmsg.txt	2010-02-08 21:10:55 +0000
@@ -5027,7 +5027,7 @@ ER_UNKNOWN_STORAGE_ENGINE 42000 
 # When using this error code, use ER(ER_WARN_DEPRECATED_SYNTAX_WITH_VER)
 # for the message string.  See, for example, code in mysql_priv.h.
 ER_WARN_DEPRECATED_SYNTAX  
-        eng "'%s' is deprecated; use '%s' instead"
+        eng "'%s' is deprecated and will be removed in a future version. Please use '%s' instead"
         ger "'%s' ist veraltet. Bitte benutzen Sie '%s'"
         por "'%s' ´┐Żesatualizado. Use '%s' em seu lugar"
         spa "'%s' est´┐Żesaprobado, use '%s' en su lugar"

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2010-02-02 13:38:44 +0000
+++ b/sql/sql_yacc.yy	2010-02-08 21:10:55 +0000
@@ -4596,7 +4596,7 @@ create_table_option:
         | TYPE_SYM opt_equal storage_engines
           {
             Lex->create_info.db_type= $3;
-            WARN_DEPRECATED(yythd, "6.0", "TYPE=storage_engine",
+            WARN_DEPRECATED(yythd, "5.4.4", "TYPE=storage_engine",
                             "'ENGINE=storage_engine'");
             Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE;
           }

Attachment: [text/bzr-bundle] bzr/magne.mahre@sun.com-20100208211055-pqvn1utltc6kmyoa.bundle
Thread
bzr commit into mysql-5.1-bugteam branch (magne.mahre:3372) Bug#47974Magne Mahre8 Feb
  • Re: bzr commit into mysql-5.1-bugteam branch (magne.mahre:3372)Bug#47974Davi Arnaut8 Feb