bk commit into 5.1 tree (msvensson:1.2198) BUG#13228

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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.2198 06/04/07 11:18:45 msvensson@neptunus.(none) +3 -0
  Bug#13228 open table cache not flushed when table schema changed
  - Error 1296 is no longer returned on first select after DROP/CREATE.

  sql/ha_ndbcluster.cc
    1.290 06/04/07 11:18:39 msvensson@neptunus.(none) +2 -0
    Add sourrounding {'s

  mysql-test/t/ndb_alter_table2.test
    1.2 06/04/07 11:18:39 msvensson@neptunus.(none) +0 -1
    Error 1296 is no longer returned on first select after DROP/CREATE, handled proactive in ndb_handle_schema_change.

  mysql-test/r/ndb_alter_table2.result
    1.2 06/04/07 11:18:39 msvensson@neptunus.(none) +1 -1
    Error 1296 is no longer returned on first select after DROP/CREATE, handled proactive in ndb_handle_schema_change.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug13228/my51-bug13228

--- 1.289/sql/ha_ndbcluster.cc	2006-03-21 19:47:41 +01:00
+++ 1.290/sql/ha_ndbcluster.cc	2006-04-07 11:18:39 +02:00
@@ -556,6 +556,7 @@
   ERR_PRINT(err);
   switch (err.classification) {
   case NdbError::SchemaError:
+  {
     invalidate_dictionary_cache(TRUE);
 
     /* Close other open handlers not used by any thread */
@@ -583,6 +584,7 @@
       DBUG_PRINT("info", ("Table exists but must have changed"));
     }
     break;
+  }
   default:
     break;
   }

--- 1.1/mysql-test/r/ndb_alter_table2.result	2006-01-10 11:35:12 +01:00
+++ 1.2/mysql-test/r/ndb_alter_table2.result	2006-04-07 11:18:39 +02:00
@@ -28,7 +28,7 @@
 c INT NOT NULL
 ) ENGINE=ndbcluster;
 select * from t1;
-ERROR HY000: Got error 241 'Invalid schema object version' from ndbcluster
+a	b	c
 select * from t1;
 a	b	c
 select * from t1;

--- 1.1/mysql-test/t/ndb_alter_table2.test	2006-01-10 11:35:12 +01:00
+++ 1.2/mysql-test/t/ndb_alter_table2.test	2006-04-07 11:18:39 +02:00
@@ -72,7 +72,6 @@
 
 connection server1;
 
---error 1296
 select * from t1;
 select * from t1;
 select * from t1;