database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

recovery from 5.0 merge for bug18676

Browse Source 
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
This commit is contained in:
unknown
2007-04-04 15:22:37 +08:00
parent 5ca5d5dee2
commit ee58034fc9
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/ndb_autodiscover.result
View File

@ -382,7 +382,7 @@ create table t1 (a int primary key) engine=ndb;
select * from t1; select * from t1;
a a
select * from t1; select * from t1;
ERROR HY000: Can't lock file (errno: 157) ERROR HY000: Can't lock file (errno: 4009)
use test; use test;
drop database test_only_ndb_tables; drop database test_only_ndb_tables;
CREATE TABLE t9 ( CREATE TABLE t9 (

2
sql/ha_ndbcluster.cc
View File

@ -221,6 +221,7 @@ static int ndb_to_mysql_error(const NdbError *ndberr)
{ {
/* read the mysql mapped error code */ /* read the mysql mapped error code */
int error= ndberr->mysql_code; int error= ndberr->mysql_code;
switch (error) switch (error)
{ {
/* errors for which we do not add warnings, just return mapped error code /* 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: default:
break; break;
} }
/* /*
Push the NDB error message as warning Push the NDB error message as warning
- Used to be able to use SHOW WARNINGS toget more info on what the error is - Used to be able to use SHOW WARNINGS toget more info on what the error is

8
sql/handler.cc
View File

@ -2865,9 +2865,9 @@ ha_find_files(THD *thd,const char *db,const char *path,
Ask handler if the table exists in engine Ask handler if the table exists in engine
RETURN RETURN
HA_ERR_NO_SUCH_TABLE Table does not exist 0 Table does not exist
HA_ERR_TABLE_EXIST Table exists 1 Table exists
# Error code # Error code
*/ */
struct st_table_exists_in_engine_args struct st_table_exists_in_engine_args
@ -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 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_ENTER("ha_table_exists_in_engine");
DBUG_PRINT("enter", ("db: %s, name: %s", db, name)); DBUG_PRINT("enter", ("db: %s, name: %s", db, name));
st_table_exists_in_engine_args args= {db, name}; st_table_exists_in_engine_args args= {db, name};

2
sql/sql_table.cc
View File

@ -3439,7 +3439,6 @@ bool mysql_create_table_internal(THD *thd,
error= 0; error= 0;
goto err; goto err;
} }
DBUG_PRINT("info",("1"));
my_error(ER_TABLE_EXISTS_ERROR, MYF(0), alias); my_error(ER_TABLE_EXISTS_ERROR, MYF(0), alias);
goto err; goto err;
} }
@ -3451,7 +3450,6 @@ bool mysql_create_table_internal(THD *thd,
{ {
if (create_info->options & HA_LEX_CREATE_IF_NOT_EXISTS) if (create_info->options & HA_LEX_CREATE_IF_NOT_EXISTS)
goto warn; goto warn;
DBUG_PRINT("info",("2"));
my_error(ER_TABLE_EXISTS_ERROR,MYF(0),table_name); my_error(ER_TABLE_EXISTS_ERROR,MYF(0),table_name);
goto unlock_and_end; goto unlock_and_end;
} }