List:Commits« Previous MessageNext Message »
From:mleich Date:October 11 2007 2:54pm
Subject:bk commit into 5.1 tree (mleich:1.2576) BUG#31411
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of mleich. When mleich 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-10-11 16:54:17+02:00, mleich@stripped +7 -0
  Fix for
  Bug#31411 funcs_1: ndb_<every test> fail because of changed server error number
  = Adjust the files with expected results 

  mysql-test/suite/funcs_1/r/ndb_cursors.result@stripped, 2007-10-11 16:54:15+02:00, mleich@stripped +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_0102.result@stripped, 2007-10-11 16:54:15+02:00, mleich@stripped +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_03.result@stripped, 2007-10-11 16:54:15+02:00, mleich@stripped +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_0407.result@stripped, 2007-10-11 16:54:15+02:00, mleich@stripped +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_08.result@stripped, 2007-10-11 16:54:15+02:00, mleich@stripped +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_09.result@stripped, 2007-10-11 16:54:15+02:00, mleich@stripped +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result@stripped, 2007-10-11 16:54:15+02:00, mleich@stripped +1 -1
    Updated result

diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_cursors.result b/mysql-test/suite/funcs_1/r/ndb_cursors.result
--- a/mysql-test/suite/funcs_1/r/ndb_cursors.result	2007-09-24 15:30:28 +02:00
+++ b/mysql-test/suite/funcs_1/r/ndb_cursors.result	2007-10-11 16:54:15 +02:00
@@ -75,7 +75,7 @@ Note	1265	Data truncated for column 'f45
 Note	1265	Data truncated for column 'f47' at row 1
 Note	1265	Data truncated for column 'f49' at row 1
 Note	1265	Data truncated for column 'f51' at row 1
-Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1477	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb1.txt' into table tb1 ;
 
 NOT YET IMPLEMENTED: cursor tests
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_trig_0102.result b/mysql-test/suite/funcs_1/r/ndb_trig_0102.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_0102.result	2007-09-24 15:30:28 +02:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_0102.result	2007-10-11 16:54:15 +02:00
@@ -65,7 +65,7 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1477	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
 
 Testcase: 3.5.1.1:
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_trig_03.result b/mysql-test/suite/funcs_1/r/ndb_trig_03.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_03.result	2007-09-24 15:30:28 +02:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_03.result	2007-10-11 16:54:15 +02:00
@@ -65,7 +65,7 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1477	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
 
 Testcase 3.5.3:
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_trig_0407.result b/mysql-test/suite/funcs_1/r/ndb_trig_0407.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_0407.result	2007-09-24 15:30:28 +02:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_0407.result	2007-10-11 16:54:15 +02:00
@@ -65,7 +65,7 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1477	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
 
 Testcase: 3.5:
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_trig_08.result b/mysql-test/suite/funcs_1/r/ndb_trig_08.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_08.result	2007-09-24 15:30:28 +02:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_08.result	2007-10-11 16:54:15 +02:00
@@ -65,7 +65,7 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1477	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
 
 Testcase: 3.5:
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_trig_09.result b/mysql-test/suite/funcs_1/r/ndb_trig_09.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_09.result	2007-09-24 15:30:28 +02:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_09.result	2007-10-11 16:54:15 +02:00
@@ -65,7 +65,7 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1477	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
 
 Testcase 3.5.9.1/2:
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result b/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result	2007-09-24 15:30:28 +02:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result	2007-10-11 16:54:15 +02:00
@@ -65,7 +65,7 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1475	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+Error	1477	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
 
 Testcase 3.5.10.1/2/3:
Thread
bk commit into 5.1 tree (mleich:1.2576) BUG#31411mleich11 Oct