Below is the list of changes that have just been committed into a local
5.1-falcon repository of hakan. When hakan does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-04-13 01:46:01+02:00, hakank@stripped +14 -0
Upgrade to 6.0.0-falcon-alpha.
client/mysqlbinlog.cc@stripped, 2007-04-13 01:45:58+02:00, hakank@stripped +1 -0
When doing a major version number upgrade
please also consider this switch statement.
configure.in@stripped, 2007-04-13 01:45:58+02:00, hakank@stripped +4 -1
Upgrade to 6.0.0-falcon-alpha.
mysql-test/r/backup.result@stripped, 2007-04-13 01:45:58+02:00, hakank@stripped +13 -13
Upgrade to 6.0.0-falcon-alpha.
mysql-test/r/comments.result@stripped, 2007-04-13 01:45:58+02:00, hakank@stripped +1 -1
Upgrade to 6.0.0-falcon-alpha.
mysql-test/r/rpl_sp.result@stripped, 2007-04-13 01:45:58+02:00, hakank@stripped +1 -1
Upgrade to 6.0.0-falcon-alpha.
mysql-test/r/show_check.result@stripped, 2007-04-13 01:45:59+02:00, hakank@stripped +1 -1
Upgrade to 6.0.0-falcon-alpha.
mysql-test/r/sp_trans.result@stripped, 2007-04-13 01:45:59+02:00, hakank@stripped +1 -1
Upgrade to 6.0.0-falcon-alpha.
mysql-test/r/type_timestamp.result@stripped, 2007-04-13 01:45:59+02:00, hakank@stripped +7 -7
Upgrade to 6.0.0-falcon-alpha.
mysql-test/r/warnings.result@stripped, 2007-04-13 01:45:59+02:00, hakank@stripped +1 -1
Upgrade to 6.0.0-falcon-alpha.
mysql-test/t/comments.test@stripped, 2007-04-13 01:45:59+02:00, hakank@stripped +1 -1
Upgrade to 6.0.0-falcon-alpha.
sql/mysqld.cc@stripped, 2007-04-13 01:45:59+02:00, hakank@stripped +4 -4
Upgrade to 6.0.0-falcon-alpha.
sql/set_var.cc@stripped, 2007-04-13 01:45:59+02:00, hakank@stripped +8 -8
Upgrade to 6.0.0-falcon-alpha.
sql/sql_parse.cc@stripped, 2007-04-13 01:45:59+02:00, hakank@stripped +5 -5
Upgrade to 6.0.0-falcon-alpha.
sql/sql_yacc.yy@stripped, 2007-04-13 01:45:59+02:00, hakank@stripped +40 -40
Upgrade to 6.0.0-falcon-alpha.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: hakank
# Host: lu0011.wdf.sap.corp
# Root: /home/hakan/work/mysql/mysql-5.1-falcon
--- 1.445/configure.in 2007-04-05 16:13:44 +02:00
+++ 1.446/configure.in 2007-04-13 01:45:58 +02:00
@@ -7,7 +7,10 @@
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
# remember to also update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.2.4-falcon-alpha)
+#
+# When changing major version number please also check switch statement
+# in mysqlbinlog::check_master_version().
+AM_INIT_AUTOMAKE(mysql, 6.0.0-falcon-alpha)
AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10
--- 1.151/client/mysqlbinlog.cc 2007-03-29 12:34:20 +02:00
+++ 1.152/client/mysqlbinlog.cc 2007-04-13 01:45:58 +02:00
@@ -1075,6 +1075,7 @@
case '4':
*description_event= new Format_description_log_event(3);
case '5':
+ case '6':
/*
The server is soon going to send us its Format_description log
event, unless it is a 5.0 server with 3.23 or 4.0 binlogs.
--- 1.598/sql/mysqld.cc 2007-04-05 16:13:45 +02:00
+++ 1.599/sql/mysqld.cc 2007-04-13 01:45:59 +02:00
@@ -7779,10 +7779,10 @@
{
slave_warning_issued = true;
/*
- ATTENTION: changed to 5.2 --> 5.3. Because we are using
- 5.1 code base with 5.2.xyz-falcon-alpha as version name.
- */
- WARN_DEPRECATED(NULL, "5.3", "for replication startup options",
+ ATTENTION: changed 5.2 to 6.1. Because we are using
+ 5.1 code base with 6.0.xyz-falcon-alpha as version name.
+ */
+ WARN_DEPRECATED(NULL, "6.1", "for replication startup options",
"'CHANGE MASTER'");
}
break;
--- 1.625/sql/sql_parse.cc 2007-04-05 16:13:46 +02:00
+++ 1.626/sql/sql_parse.cc 2007-04-13 01:45:59 +02:00
@@ -5414,11 +5414,11 @@
*/
char buf[32];
my_snprintf(buf, sizeof(buf), "TIMESTAMP(%s)", length);
- /*
- ATTENTION: changed to 5.2 --> 5.3. Because we are using
- 5.1 code base with 5.2.xyz-falcon-alpha as version name.
- */
- WARN_DEPRECATED(thd, "5.3", buf, "'TIMESTAMP'");
+ /*
+ ATTENTION: changed 5.2 to 6.1. Because we are using
+ 5.1 code base with 6.0.xyz-falcon-alpha as version name.
+ */
+ WARN_DEPRECATED(thd, "6.1", buf, "'TIMESTAMP'");
}
if (!(new_field= new create_field()) ||
--- 1.562/sql/sql_yacc.yy 2007-04-06 00:04:24 +02:00
+++ 1.563/sql/sql_yacc.yy 2007-04-13 01:45:59 +02:00
@@ -4289,11 +4289,11 @@
| TYPE_SYM opt_equal storage_engines
{
Lex->create_info.db_type= $3;
- /*
- ATTENTION: changed to 5.2 --> 5.3. Because we are using
- 5.1 code base with 5.2.xyz-falcon-alpha as version name.
+ /*
+ ATTENTION: changed 5.2 to 6.1. Because we are using
+ 5.1 code base with 6.0.xyz-falcon-alpha as version name.
*/
- WARN_DEPRECATED(yythd, "5.3", "TYPE=storage_engine",
+ WARN_DEPRECATED(yythd, "6.1", "TYPE=storage_engine",
"'ENGINE=storage_engine'");
Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE;
}
@@ -5815,12 +5815,12 @@
RESTORE_SYM table_or_tables
{
Lex->sql_command = SQLCOM_RESTORE_TABLE;
- /*
- ATTENTION: changed to 5.2 --> 5.3. Because we are using
- 5.1 code base with 5.2.xyz-falcon-alpha as version name.
- */
- WARN_DEPRECATED(yythd, "5.3", "RESTORE TABLE",
- "MySQL Administrator (mysqldump, mysql)");
+ /*
+ ATTENTION: changed 5.2 to 6.1. Because we are using
+ 5.1 code base with 6.0.xyz-falcon-alpha as version name.
+ */
+ WARN_DEPRECATED(yythd, "6.1", "RESTORE TABLE",
+ "MySQL Administrator (mysqldump, mysql)");
}
table_list FROM TEXT_STRING_sys
{
@@ -5831,12 +5831,12 @@
BACKUP_SYM table_or_tables
{
Lex->sql_command = SQLCOM_BACKUP_TABLE;
- /*
- ATTENTION: changed to 5.2 --> 5.3. Because we are using
- 5.1 code base with 5.2.xyz-falcon-alpha as version name.
- */
- WARN_DEPRECATED(yythd, "5.3", "BACKUP TABLE",
- "MySQL Administrator (mysqldump, mysql)");
+ /*
+ ATTENTION: changed 5.2 to 6.1. Because we are using
+ 5.1 code base with 6.0.xyz-falcon-alpha as version name.
+ */
+ WARN_DEPRECATED(yythd, "6.1", "BACKUP TABLE",
+ "MySQL Administrator (mysqldump, mysql)");
}
table_list TO_SYM TEXT_STRING_sys
{
@@ -8714,11 +8714,11 @@
| opt_full PLUGIN_SYM
{
LEX *lex= Lex;
- /*
- ATTENTION: changed to 5.2 --> 5.3. Because we are using
- 5.1 code base with 5.2.xyz-falcon-alpha as version name.
- */
- WARN_DEPRECATED(yythd, "5.3", "SHOW PLUGIN", "'SHOW PLUGINS'");
+ /*
+ ATTENTION: changed 5.2 to 6.1. Because we are using
+ 5.1 code base with 6.0.xyz-falcon-alpha as version name.
+ */
+ WARN_DEPRECATED(yythd, "6.1", "SHOW PLUGIN", "'SHOW PLUGINS'");
lex->sql_command= SQLCOM_SHOW_PLUGINS;
if (prepare_schema_table(YYTHD, lex, 0, SCH_PLUGINS))
MYSQL_YYABORT;
@@ -8784,7 +8784,7 @@
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES;
- WARN_DEPRECATED(yythd, "5.2", "SHOW TABLE TYPES", "'SHOW [STORAGE] ENGINES'");
+ WARN_DEPRECATED(yythd, "6.1", "SHOW TABLE TYPES", "'SHOW [STORAGE] ENGINES'");
}
| opt_storage ENGINES_SYM
{
@@ -8834,11 +8834,11 @@
my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), "InnoDB");
MYSQL_YYABORT;
}
- /*
- ATTENTION: changed to 5.2 --> 5.3. Because we are using
- 5.1 code base with 5.2.xyz-falcon-alpha as version name.
- */
- WARN_DEPRECATED(yythd, "5.3", "SHOW INNODB STATUS", "'SHOW ENGINE INNODB STATUS'");
+ /*
+ ATTENTION: changed 5.2 to 6.1. Because we are using
+ 5.1 code base with 6.0.xyz-falcon-alpha as version name.
+ */
+ WARN_DEPRECATED(yythd, "6.1", "SHOW INNODB STATUS", "'SHOW ENGINE INNODB STATUS'");
}
| MUTEX_SYM STATUS_SYM
{
@@ -8850,11 +8850,11 @@
my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), "InnoDB");
MYSQL_YYABORT;
}
- /*
- ATTENTION: changed to 5.2 --> 5.3. Because we are using
- 5.1 code base with 5.2.xyz-falcon-alpha as version name.
- */
- WARN_DEPRECATED(yythd, "5.3", "SHOW MUTEX STATUS", "'SHOW ENGINE INNODB MUTEX'");
+ /*
+ ATTENTION: changed 5.2 to 6.1. Because we are using
+ 5.1 code base with 6.0.xyz-falcon-alpha as version name.
+ */
+ WARN_DEPRECATED(yythd, "6.1", "SHOW MUTEX STATUS", "'SHOW ENGINE INNODB MUTEX'");
}
| opt_full PROCESSLIST_SYM
{ Lex->sql_command= SQLCOM_SHOW_PROCESSLIST;}
@@ -9204,11 +9204,11 @@
LOAD TABLE_SYM table_ident FROM MASTER_SYM
{
LEX *lex=Lex;
- /*
- ATTENTION: changed to 5.2 --> 5.3. Because we are using
- 5.1 code base with 5.2.xyz-falcon-alpha as version name.
+ /*
+ ATTENTION: changed 5.2 to 6.1. Because we are using
+ 5.1 code base with 6.0.xyz-falcon-alpha as version name.
*/
- WARN_DEPRECATED(yythd, "5.3", "LOAD TABLE FROM MASTER",
+ WARN_DEPRECATED(yythd, "6.1", "LOAD TABLE FROM MASTER",
"MySQL Administrator (mysqldump, mysql)");
if (lex->sphead)
{
@@ -9256,11 +9256,11 @@
FROM MASTER_SYM
{
Lex->sql_command = SQLCOM_LOAD_MASTER_DATA;
- /*
- ATTENTION: changed to 5.2 --> 5.3. Because we are using
- 5.1 code base with 5.2.xyz-falcon-alpha as version name.
+ /*
+ ATTENTION: changed 5.2 to 6.1. Because we are using
+ 5.1 code base with 6.0.xyz-falcon-alpha as version name.
*/
- WARN_DEPRECATED(yythd, "5.3", "LOAD DATA FROM MASTER",
+ WARN_DEPRECATED(yythd, "6.1", "LOAD DATA FROM MASTER",
"mysqldump or future "
"BACKUP/RESTORE DATABASE facility");
};
--- 1.37/mysql-test/r/rpl_sp.result 2007-04-05 16:13:44 +02:00
+++ 1.38/mysql-test/r/rpl_sp.result 2007-04-13 01:45:58 +02:00
@@ -181,7 +181,7 @@
ERROR HY000: You do not have the SUPER privilege and binary logging is enabled (you *might* want to use the less safe log_bin_trust_function_creators variable)
set global log_bin_trust_routine_creators=1;
Warnings:
-Warning 1543 The syntax 'log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 5.3. Please use 'log_bin_trust_function_creators' instead
+Warning 1543 The syntax 'log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 6.1. Please use 'log_bin_trust_function_creators' instead
set global log_bin_trust_function_creators=0;
set global log_bin_trust_function_creators=1;
set global log_bin_trust_function_creators=1;
--- 1.6/mysql-test/r/comments.result 2003-06-04 17:28:46 +02:00
+++ 1.7/mysql-test/r/comments.result 2007-04-13 01:45:58 +02:00
@@ -10,7 +10,7 @@
select 1 /*!32301 +1 */;
1 /*!32301 +1
2
-select 1 /*!52301 +1 */;
+select 1 /*!62301 +1 */;
1
1
select 1--1;
--- 1.112/mysql-test/r/show_check.result 2007-03-09 23:11:55 +01:00
+++ 1.113/mysql-test/r/show_check.result 2007-04-13 01:45:59 +02:00
@@ -712,7 +712,7 @@
show full plugin;
show warnings;
Level Code Message
-Warning 1543 The syntax 'SHOW PLUGIN' is deprecated and will be removed in MySQL 5.3. Please use 'SHOW PLUGINS' instead
+Warning 1543 The syntax 'SHOW PLUGIN' is deprecated and will be removed in MySQL 6.1. Please use 'SHOW PLUGINS' instead
show plugin;
show plugins;
create database `mysqlttest\1`;
--- 1.38/mysql-test/r/type_timestamp.result 2007-03-09 23:11:56 +01:00
+++ 1.39/mysql-test/r/type_timestamp.result 2007-04-13 01:45:59 +02:00
@@ -101,13 +101,13 @@
t8 timestamp(8), t10 timestamp(10), t12 timestamp(12),
t14 timestamp(14));
Warnings:
-Warning 1543 The syntax 'TIMESTAMP(2)' is deprecated and will be removed in MySQL 5.3. Please use 'TIMESTAMP' instead
-Warning 1543 The syntax 'TIMESTAMP(4)' is deprecated and will be removed in MySQL 5.3. Please use 'TIMESTAMP' instead
-Warning 1543 The syntax 'TIMESTAMP(6)' is deprecated and will be removed in MySQL 5.3. Please use 'TIMESTAMP' instead
-Warning 1543 The syntax 'TIMESTAMP(8)' is deprecated and will be removed in MySQL 5.3. Please use 'TIMESTAMP' instead
-Warning 1543 The syntax 'TIMESTAMP(10)' is deprecated and will be removed in MySQL 5.3. Please use 'TIMESTAMP' instead
-Warning 1543 The syntax 'TIMESTAMP(12)' is deprecated and will be removed in MySQL 5.3. Please use 'TIMESTAMP' instead
-Warning 1543 The syntax 'TIMESTAMP(14)' is deprecated and will be removed in MySQL 5.3. Please use 'TIMESTAMP' instead
+Warning 1543 The syntax 'TIMESTAMP(2)' is deprecated and will be removed in MySQL 6.1. Please use 'TIMESTAMP' instead
+Warning 1543 The syntax 'TIMESTAMP(4)' is deprecated and will be removed in MySQL 6.1. Please use 'TIMESTAMP' instead
+Warning 1543 The syntax 'TIMESTAMP(6)' is deprecated and will be removed in MySQL 6.1. Please use 'TIMESTAMP' instead
+Warning 1543 The syntax 'TIMESTAMP(8)' is deprecated and will be removed in MySQL 6.1. Please use 'TIMESTAMP' instead
+Warning 1543 The syntax 'TIMESTAMP(10)' is deprecated and will be removed in MySQL 6.1. Please use 'TIMESTAMP' instead
+Warning 1543 The syntax 'TIMESTAMP(12)' is deprecated and will be removed in MySQL 6.1. Please use 'TIMESTAMP' instead
+Warning 1543 The syntax 'TIMESTAMP(14)' is deprecated and will be removed in MySQL 6.1. 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",
--- 1.6/mysql-test/t/comments.test 2005-07-28 02:21:39 +02:00
+++ 1.7/mysql-test/t/comments.test 2007-04-13 01:45:59 +02:00
@@ -8,7 +8,7 @@
--error 1065
;
select 1 /*!32301 +1 */;
-select 1 /*!52301 +1 */;
+select 1 /*!62301 +1 */;
select 1--1;
# Note that the following returns 4 while it should return 2
# This is because the mysqld server doesn't parse -- comments
--- 1.203/sql/set_var.cc 2007-04-05 16:13:45 +02:00
+++ 1.204/sql/set_var.cc 2007-04-13 01:45:59 +02:00
@@ -3637,10 +3637,10 @@
void sys_var_thd_table_type::warn_deprecated(THD *thd)
{
/*
- ATTENTION: changed to 5.2 --> 5.3. Because we are using
- 5.1 code base with 5.2.xyz-falcon-alpha as version name.
- */
- WARN_DEPRECATED(thd, "5.3", "table_type", "'storage_engine'");
+ ATTENTION: changed 5.2 to 6.1. Because we are using
+ 5.1 code base with 6.0.xyz-falcon-alpha as version name.
+ */
+ WARN_DEPRECATED(thd, "6.1", "table_type", "'storage_engine'");
}
void sys_var_thd_table_type::set_default(THD *thd, enum_var_type type)
@@ -3899,10 +3899,10 @@
void sys_var_trust_routine_creators::warn_deprecated(THD *thd)
{
/*
- ATTENTION: changed to 5.2 --> 5.3. Because we are using
- 5.1 code base with 5.2.xyz-falcon-alpha as version name.
- */
- WARN_DEPRECATED(thd, "5.3", "log_bin_trust_routine_creators",
+ ATTENTION: changed 5.2 to 6.1. Because we are using
+ 5.1 code base with 6.0.xyz-falcon-alpha as version name.
+ */
+ WARN_DEPRECATED(thd, "6.1", "log_bin_trust_routine_creators",
"'log_bin_trust_function_creators'");
}
--- 1.23/mysql-test/r/backup.result 2007-03-09 23:11:55 +01:00
+++ 1.24/mysql-test/r/backup.result 2007-04-13 01:45:58 +02:00
@@ -6,26 +6,26 @@
test.t4 backup error Failed copying .frm file (errno: X)
test.t4 backup status Operation failed
Warnings:
-Warning 1543 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.3. Please use MySQL Administrator (mysqldump, mysql) instead
+Warning 1543 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.1. Please use MySQL Administrator (mysqldump, mysql) instead
Error 1 Can't create/write to file 'MYSQLTEST_VARDIR/bogus/t4.frm' (Errcode: X)
backup table t4 to '../tmp';
Table Op Msg_type Msg_text
test.t4 backup status OK
Warnings:
-Warning 1543 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.3. Please use MySQL Administrator (mysqldump, mysql) instead
+Warning 1543 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.1. Please use MySQL Administrator (mysqldump, mysql) instead
backup table t4 to '../tmp';
Table Op Msg_type Msg_text
test.t4 backup error Failed copying .frm file (errno: X)
test.t4 backup status Operation failed
Warnings:
-Warning 1543 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.3. Please use MySQL Administrator (mysqldump, mysql) instead
+Warning 1543 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.1. Please use MySQL Administrator (mysqldump, mysql) instead
Error 1 Can't create/write to file 'MYSQLTEST_VARDIR/tmp/t4.frm' (Errcode: X)
drop table t4;
restore table t4 from '../tmp';
Table Op Msg_type Msg_text
test.t4 restore status OK
Warnings:
-Warning 1543 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.3. Please use MySQL Administrator (mysqldump, mysql) instead
+Warning 1543 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 6.1. Please use MySQL Administrator (mysqldump, mysql) instead
select count(*) from t4;
count(*)
0
@@ -35,19 +35,19 @@
Table Op Msg_type Msg_text
test.t1 backup status OK
Warnings:
-Warning 1543 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.3. Please use MySQL Administrator (mysqldump, mysql) instead
+Warning 1543 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.1. Please use MySQL Administrator (mysqldump, mysql) instead
drop table t1;
restore table t1 from '../bogus';
Table Op Msg_type Msg_text
t1 restore error Failed copying .frm file
Warnings:
-Warning 1543 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.3. Please use MySQL Administrator (mysqldump, mysql) instead
+Warning 1543 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 6.1. 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 status OK
Warnings:
-Warning 1543 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.3. Please use MySQL Administrator (mysqldump, mysql) instead
+Warning 1543 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 6.1. Please use MySQL Administrator (mysqldump, mysql) instead
select n from t1;
n
23
@@ -62,7 +62,7 @@
test.t2 backup status OK
test.t3 backup status OK
Warnings:
-Warning 1543 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.3. Please use MySQL Administrator (mysqldump, mysql) instead
+Warning 1543 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.1. Please use MySQL Administrator (mysqldump, mysql) instead
drop table t1,t2,t3;
restore table t1,t2,t3 from '../tmp';
Table Op Msg_type Msg_text
@@ -70,7 +70,7 @@
test.t2 restore status OK
test.t3 restore status OK
Warnings:
-Warning 1543 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.3. Please use MySQL Administrator (mysqldump, mysql) instead
+Warning 1543 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 6.1. Please use MySQL Administrator (mysqldump, mysql) instead
select n from t1;
n
23
@@ -91,7 +91,7 @@
Table Op Msg_type Msg_text
test.t1 restore status OK
Warnings:
-Warning 1543 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.3. Please use MySQL Administrator (mysqldump, mysql) instead
+Warning 1543 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 6.1. Please use MySQL Administrator (mysqldump, mysql) instead
rename table t1 to t5;
lock tables t5 write;
backup table t5 to '../tmp';
@@ -99,7 +99,7 @@
Table Op Msg_type Msg_text
test.t5 backup status OK
Warnings:
-Warning 1543 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.3. Please use MySQL Administrator (mysqldump, mysql) instead
+Warning 1543 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.1. Please use MySQL Administrator (mysqldump, mysql) instead
drop table t5;
DROP TABLE IF EXISTS `t+1`;
CREATE TABLE `t+1` (c1 INT);
@@ -108,13 +108,13 @@
Table Op Msg_type Msg_text
test.t+1 backup status OK
Warnings:
-Warning 1543 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.3. Please use MySQL Administrator (mysqldump, mysql) instead
+Warning 1543 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.1. Please use MySQL Administrator (mysqldump, mysql) instead
DROP TABLE `t+1`;
RESTORE TABLE `t+1` FROM '../tmp';
Table Op Msg_type Msg_text
test.t+1 restore status OK
Warnings:
-Warning 1543 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.3. Please use MySQL Administrator (mysqldump, mysql) instead
+Warning 1543 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 6.1. Please use MySQL Administrator (mysqldump, mysql) instead
SELECT * FROM `t+1`;
c1
1
--- 1.58/mysql-test/r/warnings.result 2007-03-09 23:11:56 +01:00
+++ 1.59/mysql-test/r/warnings.result 2007-04-13 01:45:59 +02:00
@@ -168,7 +168,7 @@
drop table t1;
set table_type=MYISAM;
Warnings:
-Warning 1543 The syntax 'table_type' is deprecated and will be removed in MySQL 5.3. Please use 'storage_engine' instead
+Warning 1543 The syntax 'table_type' is deprecated and will be removed in MySQL 6.1. 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';
--- 1.15/mysql-test/r/sp_trans.result 2007-03-09 23:11:56 +01:00
+++ 1.16/mysql-test/r/sp_trans.result 2007-04-13 01:45:59 +02:00
@@ -535,7 +535,7 @@
CREATE PROCEDURE p1()
SHOW INNODB STATUS; |
Warnings:
-Warning 1543 The syntax 'SHOW INNODB STATUS' is deprecated and will be removed in MySQL 5.3. Please use 'SHOW ENGINE INNODB STATUS' instead
+Warning 1543 The syntax 'SHOW INNODB STATUS' is deprecated and will be removed in MySQL 6.1. 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|
| Thread |
|---|
| • bk commit into 5.1-falcon tree (hakank:1.2586) | Hakan Kuecuekyilmaz | 13 Apr |
