mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
(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]
This commit is contained in:
parent
b88a2c4752
commit
150c19ee03
1 changed files with 1 additions and 8 deletions
|
@ -5966,7 +5966,6 @@ innobase_drop_database(
|
|||
trx_t* parent_trx;
|
||||
trx_t* trx;
|
||||
char* ptr;
|
||||
int error;
|
||||
char* namebuf;
|
||||
THD* thd = current_thd;
|
||||
|
||||
|
@ -6004,7 +6003,7 @@ innobase_drop_database(
|
|||
trx->check_foreigns = FALSE;
|
||||
}
|
||||
|
||||
error = row_drop_database_for_mysql(namebuf, trx);
|
||||
row_drop_database_for_mysql(namebuf, trx);
|
||||
my_free(namebuf, MYF(0));
|
||||
|
||||
/* Flush the log to reduce probability that the .frm files and
|
||||
|
@ -6020,13 +6019,7 @@ innobase_drop_database(
|
|||
|
||||
innobase_commit_low(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;
|
||||
#endif
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
|
|
Loading…
Reference in a new issue