bk commit into 5.1 tree (gni:1.2490)

[gni]

Below is the list of changes that have just been committed into a local
5.1 repository of root. When root 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-04-04 15:22:37+08:00, gni@stripped +4 -0
  recovery from 5.0 merge for bug18676

  mysql-test/r/ndb_autodiscover.result@stripped, 2007-04-04 15:22:33+08:00, gni@stripped +1 -1
    recovery for bug#18676 merge in 5.0

  sql/ha_ndbcluster.cc@stripped, 2007-04-04 15:22:34+08:00, gni@stripped +2 -0
    recovery for bug#18676 merge in 5.0

  sql/handler.cc@stripped, 2007-04-04 15:22:34+08:00, gni@stripped +4 -4
    recovery for bug#18676 merge in 5.0

  sql/sql_table.cc@stripped, 2007-04-04 15:22:34+08:00, gni@stripped +0 -2
    recovery for bug#18676 merge in 5.0

# 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:	gni
# Host:	dev3-221.dev.cn.tlan
# Root:	/home/ngb/mysql/mysql-5.1/bug18676

--- 1.299/sql/handler.cc	2007-04-04 15:22:45 +08:00
+++ 1.300/sql/handler.cc	2007-04-04 15:22:45 +08:00
@@ -2865,9 +2865,9 @@
   Ask handler if the table exists in engine
 
   RETURN
-    HA_ERR_NO_SUCH_TABLE     Table does not exist
-    HA_ERR_TABLE_EXIST       Table exists
-    #                        Error code
+    0                   Table does not exist
+    1                   Table exists
+    #                   Error code
 
 */
 struct st_table_exists_in_engine_args
@@ -2891,7 +2891,7 @@
 
 int ha_table_exists_in_engine(THD* thd, const char* db, const char* name)
 {
-  int error= HA_ERR_NO_SUCH_TABLE;
+  int error= 0;
   DBUG_ENTER("ha_table_exists_in_engine");
   DBUG_PRINT("enter", ("db: %s, name: %s", db, name));
   st_table_exists_in_engine_args args= {db, name};

--- 1.395/sql/sql_table.cc	2007-04-04 15:22:45 +08:00
+++ 1.396/sql/sql_table.cc	2007-04-04 15:22:45 +08:00
@@ -3439,7 +3439,6 @@
       error= 0;
       goto err;
     }
-    DBUG_PRINT("info",("1"));
     my_error(ER_TABLE_EXISTS_ERROR, MYF(0), alias);
     goto err;
   }
@@ -3451,7 +3450,6 @@
     {
       if (create_info->options & HA_LEX_CREATE_IF_NOT_EXISTS)
         goto warn;
-      DBUG_PRINT("info",("2"));
       my_error(ER_TABLE_EXISTS_ERROR,MYF(0),table_name);
       goto unlock_and_end;
     }

--- 1.30/mysql-test/r/ndb_autodiscover.result	2007-04-04 15:22:45 +08:00
+++ 1.31/mysql-test/r/ndb_autodiscover.result	2007-04-04 15:22:45 +08:00
@@ -382,7 +382,7 @@
 select * from t1;
 a
 select * from t1;
-ERROR HY000: Can't lock file (errno: 157)
+ERROR HY000: Can't lock file (errno: 4009)
 use test;
 drop database test_only_ndb_tables;
 CREATE TABLE t9 (

--- 1.424/sql/ha_ndbcluster.cc	2007-04-04 15:22:45 +08:00
+++ 1.425/sql/ha_ndbcluster.cc	2007-04-04 15:22:45 +08:00
@@ -221,6 +221,7 @@
 {
   /* read the mysql mapped error code */
   int error= ndberr->mysql_code;
+
   switch (error)
   {
     /* errors for which we do not add warnings, just return mapped error code
@@ -239,6 +240,7 @@
   default:
     break;
   }
+
   /*
     Push the NDB error message as warning
     - Used to be able to use SHOW WARNINGS toget more info on what the error is