Hosting Provided By

bk commit into 6.0-falcon tree (hakank:1.2581)

From: Hakan Kuecuekyilmaz <hakan(at)mysql.com>
Date: Fri Aug 31 2007 - 14:27:14 EDT

Below is the list of changes that have just been committed into a local 6.0-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@1.2581, 2007-08-31 20:27:04+02:00, hakank@lu0011.wdf.sap.corp +10 -0 After merge fixes.

mysql-test/r/backup.result@1.26, 2007-08-31 20:26:59+02:00, hakank@lu0011.wdf.sap.corp +13 -13 After merge fixes.

mysql-test/r/ctype_latin1.result@1.12, 2007-08-31 20:26:59+02:00, hakank@lu0011.wdf.sap.corp +21 -21 After merge fixes.

mysql-test/r/show_check.result@1.115, 2007-08-31 20:27:00+02:00, hakank@lu0011.wdf.sap.corp +8 -8 After merge fixes.

mysql-test/r/sp_trans.result@1.20, 2007-08-31 20:27:00+02:00, hakank@lu0011.wdf.sap.corp +1 -1 After merge fixes.

mysql-test/r/type_timestamp.result@1.41, 2007-08-31 20:27:00+02:00, hakank@lu0011.wdf.sap.corp +7 -7 After merge fixes.

mysql-test/r/warnings.result@1.62, 2007-08-31 20:27:00+02:00, hakank@lu0011.wdf.sap.corp +3 -3 After merge fixes.

Do you need help?

mysql-test/suite/rpl/r/rpl_sp.result@1.41, 2007-08-31 20:27:00+02:00, hakank@lu0011.wdf.sap.corp +1 -1 After merge fixes.

mysql-test/t/disabled.def@1.344, 2007-08-31 20:27:00+02:00, hakank@lu0011.wdf.sap.corp +2 -27 After merge fixes.

mysql-test/t/falcon_bug_28158.test@1.5, 2007-08-31 20:27:00+02:00, hakank@lu0011.wdf.sap.corp +5 -5 After merge fixes.

sql/sql_yacc.yy@1.578, 2007-08-31 20:27:00+02:00, hakank@lu0011.wdf.sap.corp +34 -14 After merge fixes.

diff -Nrup a/mysql-test/r/backup.result b/mysql-test/r/backup.result
--- a/mysql-test/r/backup.result 2007-08-30 23:35:09 +02:00
+++ b/mysql-test/r/backup.result 2007-08-31 20:26:59 +02:00 @@ -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 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

+test.t4	backup	Warning	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.1. 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 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

+test.t4	backup	Warning	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.1. 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 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

+test.t4	backup	Warning	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.1. 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 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

+test.t4	restore	Warning	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 6.1. 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 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

+test.t1	backup	Warning	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.1. 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 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

+Warning	1287	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';
Do you need more help? 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
 Table	Op	Msg_type	Msg_text

-test.t1	restore	Warning	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

+test.t1	restore	Warning	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 6.1. 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 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

+test.t2	backup	Warning	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.1. 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 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

+test.t1	restore	Warning	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 6.1. 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 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

+test.t1	restore	Warning	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 6.1. 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 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

+test.t5	backup	Warning	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.1. 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 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

+test.t+1	backup	Warning	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.1. 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 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

+test.t+1	restore	Warning	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 6.1. Please use MySQL Administrator (mysqldump, mysql) instead
 test.t+1	restore	status	OK

SELECT * FROM `t+1`;
c1
diff -Nrup a/mysql-test/r/ctype_latin1.result b/mysql-test/r/ctype_latin1.result
--- a/mysql-test/r/ctype_latin1.result 2007-08-30 23:50:05 +02:00

+++ b/mysql-test/r/ctype_latin1.result	2007-08-31 20:26:59 +02:00
@@ -296,8 +296,8 @@ FD	C3BD	FD	1
 FE	C3BE	FE	1
 FF	C3BF	FF	1

DROP TABLE t1;
-SELECT 1 as Âƒ, 2 as ÂŠ, 3 as ÂŒ, 4 as ÂŽ, 5 as Âš, 6 as Âœ, 7 as Âž, 8 as ÂŸ;
-Âƒ ÂŠ ÂŒ ÂŽ Âš Âœ Âž ÂŸ

+SELECT 1 as ï¿½, 2 as ï¿½, 3 as ï¿½, 4 as ï¿½, 5 as ï¿½, 6 as ï¿½, 7 as ï¿½, 8 as ï¿½;

+ï¿½	ï¿½	ï¿½	ï¿½	ï¿½	ï¿½	ï¿½	ï¿½
 1	2	3	4	5	6	7	8
Can we help you? 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek

select 'a' regexp 'A' collate latin1_general_ci; 'a' regexp 'A' collate latin1_general_ci @@ -364,47 +364,47 @@ select c1 as c2h from t1 where c1 like ' c2h
ab_def
drop table t1;
-CREATE TABLE Â„a (a int);
-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 'Â„a (a int)' at line 1
-SELECT 'Â„a' as str;

+CREATE TABLE ï¿½a (a int);
+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 'ï¿½a (a int)' at line 1
+SELECT 'ï¿½a' as str;

str
-Â„a
-set @str= _latin1 'ABC Â€Â°Â§ß²Â³Âµ~ Ã¤Ã¶Ã¼Ã„Ã–Ãœ Ã¡Ã©ÃÃ³Ãº Ã€ÃˆÃŒÃ’Ã™ @ abc';
+ï¿½a
+set @str= _latin1 'ABC ï¿½ï¿½ï¿½ß²ï¿½ï¿½~ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ @ abc'; SELECT convert(@str collate latin1_bin using utf8); convert(@str collate latin1_bin using utf8)
-ABC Â€Â°Â§ß²Â³Âµ~ Ã¤Ã¶Ã¼Ã„Ã–Ãœ Ã¡Ã©ÃÃ³Ãº Ã€ÃˆÃŒÃ’Ã™ @ abc
+ABC ï¿½ï¿½ï¿½ß²ï¿½ï¿½~ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ @ abc SELECT convert(@str collate latin1_general_ci using utf8); convert(@str collate latin1_general_ci using utf8)
-ABC Â€Â°Â§ß²Â³Âµ~ Ã¤Ã¶Ã¼Ã„Ã–Ãœ Ã¡Ã©ÃÃ³Ãº Ã€ÃˆÃŒÃ’Ã™ @ abc
+ABC ï¿½ï¿½ï¿½ß²ï¿½ï¿½~ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ @ abc SELECT convert(@str collate latin1_german1_ci using utf8); convert(@str collate latin1_german1_ci using utf8)
-ABC Â€Â°Â§ß²Â³Âµ~ Ã¤Ã¶Ã¼Ã„Ã–Ãœ Ã¡Ã©ÃÃ³Ãº Ã€ÃˆÃŒÃ’Ã™ @ abc
+ABC ï¿½ï¿½ï¿½ß²ï¿½ï¿½~ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ @ abc SELECT convert(@str collate latin1_danish_ci using utf8); convert(@str collate latin1_danish_ci using utf8)
-ABC Â€Â°Â§ß²Â³Âµ~ Ã¤Ã¶Ã¼Ã„Ã–Ãœ Ã¡Ã©ÃÃ³Ãº Ã€ÃˆÃŒÃ’Ã™ @ abc
+ABC ï¿½ï¿½ï¿½ß²ï¿½ï¿½~ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ @ abc SELECT convert(@str collate latin1_spanish_ci using utf8); convert(@str collate latin1_spanish_ci using utf8)
-ABC Â€Â°Â§ß²Â³Âµ~ Ã¤Ã¶Ã¼Ã„Ã–Ãœ Ã¡Ã©ÃÃ³Ãº Ã€ÃˆÃŒÃ’Ã™ @ abc
+ABC ï¿½ï¿½ï¿½ß²ï¿½ï¿½~ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ @ abc SELECT convert(@str collate latin1_german2_ci using utf8); convert(@str collate latin1_german2_ci using utf8)
-ABC Â€Â°Â§ß²Â³Âµ~ Ã¤Ã¶Ã¼Ã„Ã–Ãœ Ã¡Ã©ÃÃ³Ãº Ã€ÃˆÃŒÃ’Ã™ @ abc
+ABC ï¿½ï¿½ï¿½ß²ï¿½ï¿½~ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ @ abc SELECT convert(@str collate latin1_swedish_ci using utf8); convert(@str collate latin1_swedish_ci using utf8)
-ABC Â€Â°Â§ß²Â³Âµ~ Ã¤Ã¶Ã¼Ã„Ã–Ãœ Ã¡Ã©ÃÃ³Ãº Ã€ÃˆÃŒÃ’Ã™ @ abc
+ABC ï¿½ï¿½ï¿½ß²ï¿½ï¿½~ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ @ abc SET NAMES latin1;
-DROP TABLE IF EXISTS `abcÃ¿def`;
-CREATE TABLE `abcÃ¿def` (i int);
-INSERT INTO `abcÃ¿def` VALUES (1);
-INSERT INTO abcÃ¿def VALUES (2);
-SELECT * FROM `abcÃ¿def`;

+DROP TABLE IF EXISTS `abcï¿½def`;
+CREATE TABLE `abcï¿½def` (i int);
+INSERT INTO `abcï¿½def` VALUES (1);
+INSERT INTO abcï¿½def VALUES (2);
+SELECT * FROM `abcï¿½def`;

i
1
2
-SELECT * FROM abcÃ¿def;

+SELECT * FROM abcï¿½def;
i
1
2
-DROP TABLE `abcÃ¿def`;

+DROP TABLE `abcï¿½def`;
select hex(cast(_ascii 0x7f as char(1) character set latin1)); hex(cast(_ascii 0x7f as char(1) character set latin1)) 7F
diff -Nrup a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
--- a/mysql-test/r/show_check.result 2007-08-30 23:50:05 +02:00
+++ b/mysql-test/r/show_check.result 2007-08-31 20:27:00 +02:00 @@ -1204,7 +1204,7 @@ set names koi8r;
DROP DATABASE IF EXISTS mysqltest1;
CREATE DATABASE mysqltest1;
use mysqltest1;
-CREATE TABLE t1(Ã‹ÃÃŒÃÃŽÃ‹Ã1 INT);

+CREATE TABLE t1(ËÏÌÏÎËÁ1 INT);

---> Dumping mysqltest1 to show_check.mysqltest1.sql

@@ -1216,7 +1216,7 @@ DROP DATABASE mysqltest1; SHOW CREATE TABLE mysqltest1.t1;

 Table	Create Table
 t1	CREATE TABLE `t1` (

- `Ã‹ÃÃŒÃÃŽÃ‹Ã1` int(11) DEFAULT NULL
+ `ËÏÌÏÎËÁ1` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP DATABASE mysqltest1;
use test;
@@ -1273,7 +1273,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 5.2. Please use 'SHOW PLUGINS' instead

+Warning	1287	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`;
@@ -1393,14 +1393,14 @@ DROP PROCEDURE IF EXISTS p1; DROP FUNCTION IF EXISTS f1;
DROP TABLE IF EXISTS t1;
DROP EVENT IF EXISTS ev1;
-CREATE VIEW v1 AS SELECT 'Ã”Ã…Ã“Ã”' AS test;
-CREATE PROCEDURE p1() SELECT 'Ã”Ã…Ã“Ã”' AS test;
-CREATE FUNCTION f1() RETURNS CHAR(10) RETURN 'Ã”Ã…Ã“Ã”';

+CREATE VIEW v1 AS SELECT 'ÔÅÓÔ' AS test;
+CREATE PROCEDURE p1() SELECT 'ÔÅÓÔ' AS test;
+CREATE FUNCTION f1() RETURNS CHAR(10) RETURN 'ÔÅÓÔ';

CREATE TABLE t1(c1 CHAR(10));
CREATE TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW
-SET NEW.c1 = 'Ã”Ã…Ã“Ã”';
-CREATE EVENT ev1 ON SCHEDULE AT '2030-01-01 00:00:00' DO SELECT 'Ã”Ã…Ã“Ã”' AS test;
+SET NEW.c1 = 'ÔÅÓÔ';
+CREATE EVENT ev1 ON SCHEDULE AT '2030-01-01 00:00:00' DO SELECT 'ÔÅÓÔ' AS test; set names utf8;
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection diff -Nrup a/mysql-test/r/sp_trans.result b/mysql-test/r/sp_trans.result
--- a/mysql-test/r/sp_trans.result 2007-08-30 23:50:05 +02:00
+++ b/mysql-test/r/sp_trans.result 2007-08-31 20:27:00 +02:00 @@ -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 5.2. Please use 'SHOW ENGINE INNODB STATUS' instead
+Warning 1287 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|
diff -Nrup a/mysql-test/r/type_timestamp.result b/mysql-test/r/type_timestamp.result
--- a/mysql-test/r/type_timestamp.result 2007-08-30 23:50:05 +02:00
+++ b/mysql-test/r/type_timestamp.result 2007-08-31 20:27:00 +02:00 @@ -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 5.2. Please use 'TIMESTAMP' instead
-Warning 1287 The syntax 'TIMESTAMP(4)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead
-Warning 1287 The syntax 'TIMESTAMP(6)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead
-Warning 1287 The syntax 'TIMESTAMP(8)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead
-Warning 1287 The syntax 'TIMESTAMP(10)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead
-Warning 1287 The syntax 'TIMESTAMP(12)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead
-Warning 1287 The syntax 'TIMESTAMP(14)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead

+Warning	1287	The syntax 'TIMESTAMP(2)' is deprecated and will be removed in MySQL 6.1. Please use 'TIMESTAMP' instead
+Warning	1287	The syntax 'TIMESTAMP(4)' is deprecated and will be removed in MySQL 6.1. Please use 'TIMESTAMP' instead
+Warning	1287	The syntax 'TIMESTAMP(6)' is deprecated and will be removed in MySQL 6.1. Please use 'TIMESTAMP' instead
+Warning	1287	The syntax 'TIMESTAMP(8)' is deprecated and will be removed in MySQL 6.1. Please use 'TIMESTAMP' instead
+Warning	1287	The syntax 'TIMESTAMP(10)' is deprecated and will be removed in MySQL 6.1. Please use 'TIMESTAMP' instead
+Warning	1287	The syntax 'TIMESTAMP(12)' is deprecated and will be removed in MySQL 6.1. Please use 'TIMESTAMP' instead
+Warning	1287	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", diff -Nrup a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result
--- a/mysql-test/r/warnings.result 2007-08-30 23:50:05 +02:00
+++ b/mysql-test/r/warnings.result 2007-08-31 20:27:00 +02:00 @@ -32,7 +32,7 @@ insert into t1 values (1); insert into t1 values ("hej");
Warnings:
Warning 1366 Incorrect integer value: 'hej' for column 'a' at row 1
-insert into t1 values ("hej"),("dÃ¥");

+insert into t1 values ("hej"),("då");
Warnings:

 Warning	1366	Incorrect integer value: 'hej' for column 'a' at row 1
 Warning	1366	Incorrect integer value: 'd?' for column 'a' at row 2

@@ -40,7 +40,7 @@ set SQL_WARNINGS=1;
insert into t1 values ("hej");
Warnings:
Warning 1366 Incorrect integer value: 'hej' for column 'a' at row 1
-insert into t1 values ("hej"),("dÃ¥");

+insert into t1 values ("hej"),("då");
Warnings:

 Warning	1366	Incorrect integer value: 'hej' for column 'a' at row 1
Can't find what you're looking for? 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
 Warning	1366	Incorrect integer value: 'd?' for column 'a' at row 2
@@ -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 5.2. Please use 'storage_engine' instead
+Warning 1287 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';
diff -Nrup a/mysql-test/suite/rpl/r/rpl_sp.result b/mysql-test/suite/rpl/r/rpl_sp.result
--- a/mysql-test/suite/rpl/r/rpl_sp.result 2007-08-30 23:50:05 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_sp.result 2007-08-31 20:27:00 +02:00 @@ -193,7 +193,7 @@ end|
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 1287 The syntax 'log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 5.2. Please use 'log_bin_trust_function_creators' instead
+Warning 1287 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;
diff -Nrup a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def

--- a/mysql-test/t/disabled.def	2007-08-30 23:50:05 +02:00

+++ b/mysql-test/t/disabled.def	2007-08-31 20:27:00 +02:00
@@ -23,34 +23,9 @@ im_utils                 : BUG#28743 Ins
 concurrent_innodb        : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences
 ctype_big5               : BUG#26711 2007-06-21 Lars Test has never worked on Double Whopper
 

-ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
-ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
-ndb_load                 : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed

+mysql_upgrade        : Bug#28560 test links to /usr/local/mysql/lib libraries, causes non-determinism and failures on ABI breakage

+federated_transactions : Bug#29523 Transactions do not work

-partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
-rpl_ndb_circular_simplex : BUG#27972 2007-04-20 mats Slave cannot start where it stopped
-rpl_ndb_2innodb : BUG#19227 2006-04-20 pekka pk delete apparently not replicated
-rpl_ndb_2myisam : BUG#19227 Seems to pass currently
-rpl_ndb_dd_partitions : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD
-rpl_ddl : BUG#26418 2007-03-01 mleich Slave out of sync after CREATE/DROP TEMPORARY TABLE + ROLLBACK on master
-rpl_ndb_innodb2ndb : Bug #19710 Cluster replication to partition table fails on DELETE FROM statement
-rpl_ndb_myisam2ndb : Bug #19710 Cluster replication to partition table fails on DELETE FROM statement
-#rpl_row_blob_innodb : BUG#18980 2006-04-10 kent Test fails randomly
-rpl_ndb_ddl : BUG#28798 2007-05-31 lars Valgrind failure in NDB
-
-# the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
-#ndb_binlog_ddl_multi : BUG#18976 2006-04-10 kent CRBR: multiple binlog, second binlog may miss schema log events
-#ndb_binlog_discover : bug#21806 2006-08-24
-#ndb_autodiscover3 : bug#21806
-
-#rpl_ndb_dd_advance : Bug#25913 rpl_ndb_dd_advance fails randomly
-
-rpl_ndb_stm_innodb : Bug#26783
-ndb_partition_error2 : HF is not sure if the test can work as internded on all the platforms
-
-im_options_set : Bug#20294: Instance manager tests fail randomly
-im_options_unset : Bug#20294: Instance manager tests fail randomly
-ndb_restore : 2007-05-03 hakank Fails randomly

 handler_falcon      : Bug#28096 2007-01-23 hakank Currently fails
 falcon_deadlock     : Bug#28097 2007-04-25 hakank Currently hangs
 falcon_bug_22144    : Bug#22144 2006-08-24 hakank Get pushbuild green
diff -Nrup a/mysql-test/t/falcon_bug_28158.test b/mysql-test/t/falcon_bug_28158.test

--- a/mysql-test/t/falcon_bug_28158.test	2007-07-11 18:55:42 +02:00

+++ b/mysql-test/t/falcon_bug_28158.test	2007-08-31 20:27:00 +02:00

@@ -34,14 +34,14 @@ INSERT INTO t3 VALUES (2, 2); UPDATE t1 SET a = 1;
UPDATE t1 SET a = 1 ORDER BY a;

Don't know where to look next?

---error 1582

+--error ER_DUP_ENTRY
UPDATE t2 SET a = 1;
---error 1582

+--error ER_DUP_ENTRY
UPDATE t2 SET a = 1 ORDER BY a;

---error 1582

+--error ER_DUP_ENTRY
UPDATE t3 SET a = 1;
---error 1582

+--error ER_DUP_ENTRY
UPDATE t3 SET a = 1 ORDER BY a;

 # ----------------------------------------------------- #
@@ -76,7 +76,7 @@ INSERT INTO t2 VALUES (2, 2);
 # ----------------------------------------------------- #
 # --- Test                                          --- #
 # ----------------------------------------------------- #

---error ER_DUP_ENTRY_WITH_KEY_NAME

+--error ER_DUP_ENTRY
UPDATE t1, t2 SET t1.a = 1, t2.a = 1;

 # ----------------------------------------------------- #
diff -Nrup a/sql/sql_yacc.yy b/sql/sql_yacc.yy

--- a/sql/sql_yacc.yy	2007-08-31 09:37:48 +02:00

+++ b/sql/sql_yacc.yy	2007-08-31 20:27:00 +02:00
@@ -7181,6 +7181,8 @@ function_call_conflict:
           { $$= new (YYTHD->mem_root) Item_func_repeat($3,$5); }
         | REPLACE '(' expr ',' expr ',' expr ')'
Confused? Frustrated? 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
           { $$= new (YYTHD->mem_root) Item_func_replace($3,$5,$7); }
+        | REVERSE_SYM '(' expr ')'
+          { $$= new (YYTHD->mem_root) Item_func_reverse($3); }
         | TRUNCATE_SYM '(' expr ',' expr ')'
           { $$= new (YYTHD->mem_root) Item_func_round($3,$5,1); }
         | WEEK_SYM '(' expr ')'

@@ -7192,6 +7194,8 @@ function_call_conflict:

             $$= new (thd->mem_root) Item_func_week($3, i1);
           }
+        | WEEK_SYM '(' expr ',' expr ')'
+          { $$= new (YYTHD->mem_root) Item_func_week($3,$5); }
 	| WEIGHT_STRING_SYM '(' expr opt_ws_levels ')'
 	  { $$= new (YYTHD->mem_root) Item_func_weight_string($3, 0, $4); }
 	| WEIGHT_STRING_SYM '(' expr AS CHAR_SYM ws_nweights opt_ws_levels ')'
@@ -9121,7 +9125,11 @@ show_param:
         | opt_full PLUGIN_SYM
           {
             LEX *lex= Lex;

-            WARN_DEPRECATED(yythd, "5.2", "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;
@@ -9190,7 +9198,11 @@ show_param:
           {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES;

-            WARN_DEPRECATED(yythd, "5.2", "SHOW TABLE TYPES", "'SHOW [STORAGE] ENGINES'");

+            /*
+               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 TABLE TYPES", "'SHOW [STORAGE] ENGINES'");
             if (prepare_schema_table(YYTHD, lex, 0, SCH_ENGINES))
               MYSQL_YYABORT;
           }
@@ -9242,11 +9254,11 @@ show_param:
               my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), "InnoDB");
Call Pantek today for Open Source Technical Support at 1-877-546-8934 - 24/7/365 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
               MYSQL_YYABORT;
             }

-          /*
-             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'");

+            /*
+              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
           {
@@ -9258,11 +9270,11 @@ show_param:
               my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), "InnoDB");
               MYSQL_YYABORT;
             }

-          /*
-             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'");

+            /*
+              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;}
@@ -9657,7 +9669,11 @@ load:
         | LOAD TABLE_SYM table_ident FROM MASTER_SYM
           {
             LEX *lex=Lex;

-            WARN_DEPRECATED(yythd, "5.2", "LOAD TABLE FROM MASTER",

+            /*
+               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", "LOAD TABLE FROM MASTER",
                             "MySQL Administrator (mysqldump, mysql)");
             if (lex->sphead)
             {
@@ -9707,7 +9723,11 @@ load_data:
         | FROM MASTER_SYM
           {
             Lex->sql_command = SQLCOM_LOAD_MASTER_DATA;

-            WARN_DEPRECATED(yythd, "5.2", "LOAD DATA FROM MASTER",

+            /*
+               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", "LOAD DATA FROM MASTER",
Do you need help? 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
                             "mysqldump or future "
                             "BACKUP/RESTORE DATABASE facility");
           }

--

MySQL Code Commits Mailing List
For list archives: http://lists.mysql.com/commits To unsubscribe: http://lists.mysql.com/commits?unsub=lists@pantek.com Received on Fri Aug 31 15:20:20 2007

This message: [ Message body ]
Next message: Chad MILLER: "bk commit into 5.0 tree (cmiller:1.2500) BUG#15776"
Previous message: ahristov(at)mysql.com: "PHP mysqlnd svn commit: r968 - trunk/mysqlnd"

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]

This archive was generated by hypermail 2.1.8 : Sun Oct 07 2007 - 09:02:03 EDT