From 9569e0d31746e9ff444288e165953320aa7245e2 Mon Sep 17 00:00:00 2001
From: Baron Schwartz <baron@xaprb.com>
Date: Sun, 3 Jun 2012 17:47:32 -0400
Subject: [PATCH] Fix schema tests for mySQL 5.5 changes

---
 t/lib/SchemaIterator.t                                     | 7 ++++---
 .../{all-dbs-tbls.txt => all-dbs-tbls-5.1.txt}             | 0
 t/lib/samples/SchemaIterator/mysql-user-ddl.txt            | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)
 rename t/lib/samples/SchemaIterator/{all-dbs-tbls.txt => all-dbs-tbls-5.1.txt} (100%)

diff --git a/t/lib/SchemaIterator.t b/t/lib/SchemaIterator.t
index 76450f53..f16f9771 100644
--- a/t/lib/SchemaIterator.t
+++ b/t/lib/SchemaIterator.t
@@ -130,8 +130,9 @@ SKIP: {
    # Test simple, unfiltered get_db_itr().
    # ########################################################################
    test_so(
-      result    => $sandbox_version ge '5.1' ? "$out/all-dbs-tbls.txt"
-                                             : "$out/all-dbs-tbls-5.0.txt",
+      result    => $sandbox_version ge '5.5' ? "$out/all-dbs-tbls.txt"
+                 : $sandbox_version ge '5.1' ? "$out/all-dbs-tbls-5.1.txt"
+                 :                             "$out/all-dbs-tbls-5.0.txt",
       test_name => "Iterate all schema objects with dbh",
    );
 
@@ -190,7 +191,7 @@ SKIP: {
    # Filter by engines.  This also tests that --engines is case-insensitive
    test_so(
       filters   => ['-d', 'd1,d2,d3', '--engines', 'INNODB'],
-      result    => "d1.t2 ",
+      result    => ($sandbox_version ge '5.5' ? 'd1.t2 d2.t1 ' : "d1.t2 "),
       test_name => '--engines',
    );
 
diff --git a/t/lib/samples/SchemaIterator/all-dbs-tbls.txt b/t/lib/samples/SchemaIterator/all-dbs-tbls-5.1.txt
similarity index 100%
rename from t/lib/samples/SchemaIterator/all-dbs-tbls.txt
rename to t/lib/samples/SchemaIterator/all-dbs-tbls-5.1.txt
diff --git a/t/lib/samples/SchemaIterator/mysql-user-ddl.txt b/t/lib/samples/SchemaIterator/mysql-user-ddl.txt
index d5f73afa..7f833482 100644
--- a/t/lib/samples/SchemaIterator/mysql-user-ddl.txt
+++ b/t/lib/samples/SchemaIterator/mysql-user-ddl.txt
@@ -31,6 +31,7 @@ CREATE TABLE `user` (
   `Create_user_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
   `Event_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
   `Trigger_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Create_tablespace_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
   `ssl_type` enum('','ANY','X509','SPECIFIED') CHARACTER SET utf8 NOT NULL DEFAULT '',
   `ssl_cipher` blob NOT NULL,
   `x509_issuer` blob NOT NULL,
@@ -39,6 +40,8 @@ CREATE TABLE `user` (
   `max_updates` int(11) unsigned NOT NULL DEFAULT '0',
   `max_connections` int(11) unsigned NOT NULL DEFAULT '0',
   `max_user_connections` int(11) unsigned NOT NULL DEFAULT '0',
+  `plugin` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `authentication_string` text COLLATE utf8_bin NOT NULL,
   PRIMARY KEY (`Host`,`User`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges'