bzr push into mysql-trunk branch (mattias.jonsson:3796 to 3797) Bug#13511529

[Mattias Jonsson]

 3797 Mattias Jonsson	2012-01-26
      Bug#13511529 post-push fix of test.
      
      Test failed with --ps-protocol.
      
      Fixed by moving failing create table's to before
      the working one.

    modified:
      mysql-test/r/plugin.result
      mysql-test/t/plugin.test
 3796 Jorgen Loland	2012-01-26 [merge]
      Merge 5.5 to trunk

    modified:
      storage/innobase/ibuf/ibuf0ibuf.cc
=== modified file 'mysql-test/r/plugin.result'
--- a/mysql-test/r/plugin.result	revid:jorgen.loland@stripped
+++ b/mysql-test/r/plugin.result	revid:mattias.jonsson@stripped
@@ -8,6 +8,11 @@ INSTALL PLUGIN EXAMPLE SONAME 'ha_exampl
 ERROR HY000: Function 'EXAMPLE' already exists
 UNINSTALL PLUGIN example;
 INSTALL PLUGIN example SONAME 'ha_example.so';
+# Example engine does not support indexes
+CREATE TABLE t1 (a int PRIMARY KEY) ENGINE=EXAMPLE;
+ERROR 42000: Too many key parts specified; max 0 parts allowed
+CREATE TABLE t1 (a int, KEY (a)) ENGINE=EXAMPLE;
+ERROR 42000: Too many key parts specified; max 0 parts allowed
 CREATE TABLE t1(a int) ENGINE=EXAMPLE;
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -29,11 +34,6 @@ DELETE FROM t1 WHERE a = 0;
 HANDLER t1 OPEN;
 ERROR HY000: Table storage engine for 't1' doesn't have this option
 DROP TABLE t1;
-# Example engine does not support indexes
-CREATE TABLE t1 (a int PRIMARY KEY) ENGINE=EXAMPLE;
-ERROR 42000: Too many key parts specified; max 0 parts allowed
-CREATE TABLE t1 (a int, KEY (a)) ENGINE=EXAMPLE;
-ERROR 42000: Too many key parts specified; max 0 parts allowed
 set global example_ulong_var=500;
 set global example_enum_var= e1;
 show status like 'example%';

=== modified file 'mysql-test/t/plugin.test'
--- a/mysql-test/t/plugin.test	revid:jorgen.loland@stripped
+++ b/mysql-test/t/plugin.test	revid:mattias.jonsson@stripped
@@ -15,6 +15,13 @@ UNINSTALL PLUGIN example;
 --replace_regex /\.dll/.so/
 eval INSTALL PLUGIN example SONAME '$EXAMPLE_PLUGIN';
 
+--echo # Example engine does not support indexes
+--error ER_TOO_MANY_KEY_PARTS
+CREATE TABLE t1 (a int PRIMARY KEY) ENGINE=EXAMPLE;
+--error ER_TOO_MANY_KEY_PARTS
+CREATE TABLE t1 (a int, KEY (a)) ENGINE=EXAMPLE;
+
+
 CREATE TABLE t1(a int) ENGINE=EXAMPLE;
 
 SHOW CREATE TABLE t1;
@@ -38,12 +45,6 @@ HANDLER t1 OPEN;
 
 DROP TABLE t1;
 
---echo # Example engine does not support indexes
---error ER_TOO_MANY_KEY_PARTS
-CREATE TABLE t1 (a int PRIMARY KEY) ENGINE=EXAMPLE;
---error ER_TOO_MANY_KEY_PARTS
-CREATE TABLE t1 (a int, KEY (a)) ENGINE=EXAMPLE;
-
 # a couple of tests for variables
 set global example_ulong_var=500;
 set global example_enum_var= e1;

No bundle (reason: useless for push emails).