Below is the list of changes that have just been committed into a local
5.1 repository of gshchepa. When gshchepa 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-08-03 12:37:00+02:00, gshchepa@stripped +6 -0
Many files:
Post-merge fix.
mysql-test/suite/ndb/r/ndb_dd_basic.result@stripped, 2007-08-03 11:38:20+02:00, gshchepa@stripped +3 -3
Post-merge fix.
mysql-test/suite/ndb/r/ndb_dd_ddl.result@stripped, 2007-08-03 11:48:59+02:00, gshchepa@stripped +1 -1
Post-merge fix.
mysql-test/suite/ndb/r/ndb_gis.result@stripped, 2007-08-03 12:02:56+02:00, gshchepa@stripped +2 -2
Post-merge fix.
mysql-test/suite/ndb/r/ndb_row_format.result@stripped, 2007-08-03 12:21:14+02:00, gshchepa@stripped +1 -1
Post-merge fix.
mysql-test/suite/ndb/r/ndb_single_user.result@stripped, 2007-08-03 12:26:44+02:00, gshchepa@stripped +5 -5
Post-merge fix.
mysql-test/suite/rpl/r/rpl_udf.result@stripped, 2007-08-03 11:12:47+02:00, gshchepa@stripped +4 -4
Post-merge fix.
diff -Nrup a/mysql-test/suite/ndb/r/ndb_dd_basic.result b/mysql-test/suite/ndb/r/ndb_dd_basic.result
--- a/mysql-test/suite/ndb/r/ndb_dd_basic.result 2007-07-09 10:54:16 +02:00
+++ b/mysql-test/suite/ndb/r/ndb_dd_basic.result 2007-08-03 11:38:20 +02:00
@@ -5,20 +5,20 @@ INITIAL_SIZE 16M
UNDO_BUFFER_SIZE = 1M
ENGINE=MYISAM;
Warnings:
-Error 1475 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
+Error 1476 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
ALTER LOGFILE GROUP lg1
ADD UNDOFILE 'undofile02.dat'
INITIAL_SIZE = 4M
ENGINE=XYZ;
Warnings:
Warning 1286 Unknown table engine 'XYZ'
-Error 1475 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
+Error 1476 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
CREATE TABLESPACE ts1
ADD DATAFILE 'datafile.dat'
USE LOGFILE GROUP lg1
INITIAL_SIZE 12M;
Warnings:
-Error 1475 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
+Error 1476 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
set storage_engine=ndb;
CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat'
diff -Nrup a/mysql-test/suite/ndb/r/ndb_dd_ddl.result b/mysql-test/suite/ndb/r/ndb_dd_ddl.result
--- a/mysql-test/suite/ndb/r/ndb_dd_ddl.result 2007-07-09 10:54:16 +02:00
+++ b/mysql-test/suite/ndb/r/ndb_dd_ddl.result 2007-08-03 11:48:59 +02:00
@@ -16,7 +16,7 @@ ERROR HY000: Failed to create LOGFILE GR
SHOW WARNINGS;
Level Code Message
Error 1296 Got error 1514 'Currently there is a limit of one logfile group' from NDB
-Error 1525 Failed to create LOGFILE GROUP
+Error 1526 Failed to create LOGFILE GROUP
CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat'
INITIAL_SIZE 1M
diff -Nrup a/mysql-test/suite/ndb/r/ndb_gis.result b/mysql-test/suite/ndb/r/ndb_gis.result
--- a/mysql-test/suite/ndb/r/ndb_gis.result 2007-07-09 10:54:16 +02:00
+++ b/mysql-test/suite/ndb/r/ndb_gis.result 2007-08-03 12:02:56 +02:00
@@ -463,7 +463,7 @@ drop table t1;
End of 4.1 tests
CREATE TABLE t1 (name VARCHAR(100), square GEOMETRY);
Warnings:
-Error 1475 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error 1476 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
INSERT INTO t1 VALUES("center", GeomFromText('POLYGON (( 0 0, 0 2, 2 2, 2 0, 0 0))'));
INSERT INTO t1 VALUES("small", GeomFromText('POLYGON (( 0 0, 0 1, 1 1, 1 0, 0 0))'));
INSERT INTO t1 VALUES("big", GeomFromText('POLYGON (( 0 0, 0 3, 3 3, 3 0, 0 0))'));
@@ -1013,7 +1013,7 @@ drop table t1;
End of 4.1 tests
CREATE TABLE t1 (name VARCHAR(100), square GEOMETRY);
Warnings:
-Error 1475 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error 1476 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
INSERT INTO t1 VALUES("center", GeomFromText('POLYGON (( 0 0, 0 2, 2 2, 2 0, 0 0))'));
INSERT INTO t1 VALUES("small", GeomFromText('POLYGON (( 0 0, 0 1, 1 1, 1 0, 0 0))'));
INSERT INTO t1 VALUES("big", GeomFromText('POLYGON (( 0 0, 0 3, 3 3, 3 0, 0 0))'));
diff -Nrup a/mysql-test/suite/ndb/r/ndb_row_format.result b/mysql-test/suite/ndb/r/ndb_row_format.result
--- a/mysql-test/suite/ndb/r/ndb_row_format.result 2007-07-09 10:54:16 +02:00
+++ b/mysql-test/suite/ndb/r/ndb_row_format.result 2007-08-03 12:21:14 +02:00
@@ -8,7 +8,7 @@ ENGINE=NDB;
ERROR HY000: Can't create table 'test.t1' (errno: 138)
SHOW WARNINGS;
Level Code Message
-Error 1475 Table storage engine 'ndbcluster' does not support the create option 'Row format FIXED incompatible with variable sized attribute'
+Error 1476 Table storage engine 'ndbcluster' does not support the create option 'Row format FIXED incompatible with variable sized attribute'
Error 1005 Can't create table 'test.t1' (errno: 138)
CREATE TABLE t1
( a INT KEY,
diff -Nrup a/mysql-test/suite/ndb/r/ndb_single_user.result b/mysql-test/suite/ndb/r/ndb_single_user.result
--- a/mysql-test/suite/ndb/r/ndb_single_user.result 2007-07-09 10:54:16 +02:00
+++ b/mysql-test/suite/ndb/r/ndb_single_user.result 2007-08-03 12:26:44 +02:00
@@ -11,7 +11,7 @@ ERROR HY000: Failed to create LOGFILE GR
show warnings;
Level Code Message
Error 1296 Got error 299 'Operation not allowed or aborted due to single user mode' from NDB
-Error 1525 Failed to create LOGFILE GROUP
+Error 1526 Failed to create LOGFILE GROUP
create table t1 (a int key, b int unique, c int) engine ndb;
CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat'
@@ -27,14 +27,14 @@ ERROR HY000: Failed to create TABLESPACE
show warnings;
Level Code Message
Error 1296 Got error 299 'Operation not allowed or aborted due to single user mode' from NDB
-Error 1525 Failed to create TABLESPACE
+Error 1526 Failed to create TABLESPACE
DROP LOGFILE GROUP lg1
ENGINE =NDB;
ERROR HY000: Failed to drop LOGFILE GROUP
show warnings;
Level Code Message
Error 1296 Got error 299 'Operation not allowed or aborted due to single user mode' from NDB
-Error 1526 Failed to drop LOGFILE GROUP
+Error 1527 Failed to drop LOGFILE GROUP
CREATE TABLESPACE ts1
ADD DATAFILE 'datafile.dat'
USE LOGFILE GROUP lg1
@@ -47,7 +47,7 @@ ERROR HY000: Failed to alter: DROP DATA
show warnings;
Level Code Message
Error 1296 Got error 299 'Operation not allowed or aborted due to single user mode' from NDB
-Error 1530 Failed to alter: DROP DATAFILE
+Error 1531 Failed to alter: DROP DATAFILE
ALTER TABLESPACE ts1
DROP DATAFILE 'datafile.dat'
ENGINE NDB;
@@ -57,7 +57,7 @@ ERROR HY000: Failed to drop TABLESPACE
show warnings;
Level Code Message
Error 1296 Got error 299 'Operation not allowed or aborted due to single user mode' from NDB
-Error 1526 Failed to drop TABLESPACE
+Error 1527 Failed to drop TABLESPACE
DROP TABLESPACE ts1
ENGINE NDB;
DROP LOGFILE GROUP lg1
diff -Nrup a/mysql-test/suite/rpl/r/rpl_udf.result b/mysql-test/suite/rpl/r/rpl_udf.result
--- a/mysql-test/suite/rpl/r/rpl_udf.result 2007-06-27 14:28:29 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_udf.result 2007-08-03 11:12:47 +02:00
@@ -182,19 +182,19 @@ CREATE TABLE t1(sum INT, price FLOAT(24)
affected rows: 0
INSERT INTO t1 VALUES(myfunc_int(100), myfunc_double(50.00));
Warnings:
-Warning 1589 Statement is not safe to log in statement format.
+Warning 1590 Statement is not safe to log in statement format.
affected rows: 1
INSERT INTO t1 VALUES(myfunc_int(10), myfunc_double(5.00));
Warnings:
-Warning 1589 Statement is not safe to log in statement format.
+Warning 1590 Statement is not safe to log in statement format.
affected rows: 1
INSERT INTO t1 VALUES(myfunc_int(200), myfunc_double(25.00));
Warnings:
-Warning 1589 Statement is not safe to log in statement format.
+Warning 1590 Statement is not safe to log in statement format.
affected rows: 1
INSERT INTO t1 VALUES(myfunc_int(1), myfunc_double(500.00));
Warnings:
-Warning 1589 Statement is not safe to log in statement format.
+Warning 1590 Statement is not safe to log in statement format.
affected rows: 1
SELECT * FROM t1 ORDER BY sum;
sum price
| Thread |
|---|
| • bk commit into 5.1 tree (gshchepa:1.2585) | gshchepa | 3 Aug |
