Commit de128616 authored by Vasil Dimov's avatar Vasil Dimov

(partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6

Fix compiler warning:
handler/ha_innodb.cc: In function 'void innobase_drop_database(handlerton*, char*)':
handler/ha_innodb.cc:5969:6: error: variable 'error' set but not used [-Werror=unused-but-set-variable]
parent bed81fec
...@@ -5966,7 +5966,6 @@ innobase_drop_database( ...@@ -5966,7 +5966,6 @@ innobase_drop_database(
trx_t* parent_trx; trx_t* parent_trx;
trx_t* trx; trx_t* trx;
char* ptr; char* ptr;
int error;
char* namebuf; char* namebuf;
THD* thd = current_thd; THD* thd = current_thd;
...@@ -6004,7 +6003,7 @@ innobase_drop_database( ...@@ -6004,7 +6003,7 @@ innobase_drop_database(
trx->check_foreigns = FALSE; trx->check_foreigns = FALSE;
} }
error = row_drop_database_for_mysql(namebuf, trx); row_drop_database_for_mysql(namebuf, trx);
my_free(namebuf, MYF(0)); my_free(namebuf, MYF(0));
/* Flush the log to reduce probability that the .frm files and /* Flush the log to reduce probability that the .frm files and
...@@ -6020,13 +6019,7 @@ innobase_drop_database( ...@@ -6020,13 +6019,7 @@ innobase_drop_database(
innobase_commit_low(trx); innobase_commit_low(trx);
trx_free_for_mysql(trx); trx_free_for_mysql(trx);
#ifdef NO_LONGER_INTERESTED_IN_DROP_DB_ERROR
error = convert_error_code_to_mysql(error, NULL);
return(error);
#else
return; return;
#endif
} }
/************************************************************************* /*************************************************************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment