mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

close[t:3938] the information schema now protects itself from a failed tokudb_init_func()

Browse source 
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@35224 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
John Esmet 2013-04-17 00:02:06 -04:00 committed by Yoni Fogel
parent f629cdcd6a
commit da1819a880
1 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
storage/tokudb/hatoku_hton.cc
View file

@ -249,6 +249,9 @@ extern "C" {
}
#endif
// let's us track if the tokudb_init_func failed
static int tokudb_init_func_failed = 0;
static int tokudb_init_func(void *p) {
TOKUDB_DBUG_ENTER("tokudb_init_func");
int r;
@ -480,6 +483,8 @@ error:
assert(rr==0);
db_env = 0;
}
// we failed, let's not forget that.
tokudb_init_func_failed = 1;
DBUG_RETURN(TRUE);
}
@ -1616,12 +1621,18 @@ static ST_FIELD_INFO tokudb_user_data_field_info[] = {
};
static int tokudb_user_data_fill_table(THD *thd, TABLE_LIST *tables, COND *cond) {
TABLE *table = tables->table;
int error;
uint64_t data_size;
int error = tokudb_get_user_data_size(thd, false, &data_size);
if (error == 0) {
table->field[0]->store(data_size, false);
error = schema_table_store_record(thd, table);
TABLE *table = tables->table;
if (tokudb_init_func_failed) {
my_error(ER_PLUGIN_IS_NOT_LOADED, MYF(0), "TokuDB");
error = -1;
} else {
error = tokudb_get_user_data_size(thd, false, &data_size);
if (error == 0) {
table->field[0]->store(data_size, false);
error = schema_table_store_record(thd, table);
}
}
return error;
}
@ -1645,12 +1656,18 @@ static ST_FIELD_INFO tokudb_user_data_exact_field_info[] = {
};
static int tokudb_user_data_exact_fill_table(THD *thd, TABLE_LIST *tables, COND *cond) {
TABLE *table = tables->table;
int error;
uint64_t data_size;
int error = tokudb_get_user_data_size(thd, true, &data_size);
if (error == 0) {
table->field[0]->store(data_size, false);
error = schema_table_store_record(thd, table);
TABLE *table = tables->table;
if (tokudb_init_func_failed) {
my_error(ER_PLUGIN_IS_NOT_LOADED, MYF(0), "TokuDB");
error = -1;
} else {
error = tokudb_get_user_data_size(thd, true, &data_size);
if (error == 0) {
table->field[0]->store(data_size, false);
error = schema_table_store_record(thd, table);
}
}
return error;
}