Commit ee58034f authored by unknown's avatar unknown
Browse files

recovery from 5.0 merge for bug18676 


mysql-test/r/ndb_autodiscover.result:
  recovery for bug#18676 merge in 5.0
sql/ha_ndbcluster.cc:
  recovery for bug#18676 merge in 5.0
sql/handler.cc:
  recovery for bug#18676 merge in 5.0
sql/sql_table.cc:
  recovery for bug#18676 merge in 5.0
parent 5ca5d5de

mysql-test/r/ndb_autodiscover.result

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ create table t1 (a int primary key) engine=ndb; 
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 (

sql/ha_ndbcluster.cc

+2 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ static int ndb_to_mysql_error(const NdbError *ndberr) 
{

  /* 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 @@ static int ndb_to_mysql_error(const NdbError *ndberr) 
  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

sql/handler.cc

+4 −4
Original line number Diff line number Diff line
@@ -2865,8 +2865,8 @@ ha_find_files(THD *thd,const char *db,const char *path, 
  Ask handler if the table exists in engine



  RETURN

    HA_ERR_NO_SUCH_TABLE     Table does not exist

    HA_ERR_TABLE_EXIST       Table exists

    0                   Table does not exist

    1                   Table exists

    #                   Error code



*/
@@ -2891,7 +2891,7 @@ static my_bool table_exists_in_engine_handlerton(THD *thd, st_plugin_int *plugin 


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};

sql/sql_table.cc

+0 −2
Original line number Diff line number Diff line
@@ -3439,7 +3439,6 @@ bool mysql_create_table_internal(THD *thd, 
      error= 0;

      goto err;

    }

    DBUG_PRINT("info",("1"));

    my_error(ER_TABLE_EXISTS_ERROR, MYF(0), alias);

    goto err;

  }
@@ -3451,7 +3450,6 @@ bool mysql_create_table_internal(THD *thd, 
    {

      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;

    }