Commit 44f3cddf authored by Rich Prohaska's avatar Rich Prohaska

DB-736 fix tokudb IS table errors

parent b8c3131f
...@@ -4,6 +4,6 @@ create table t (id int primary key); ...@@ -4,6 +4,6 @@ create table t (id int primary key);
begin; begin;
insert into t values (1),(2); insert into t values (1),(2);
select * from information_schema.tokudb_fractal_tree_info; select * from information_schema.tokudb_fractal_tree_info;
ERROR HY000: Unknown error -30994 ERROR HY000: Got error -30994 from storage engine
commit; commit;
drop table t; drop table t;
...@@ -7,7 +7,7 @@ enable_warnings; ...@@ -7,7 +7,7 @@ enable_warnings;
create table t (id int primary key); create table t (id int primary key);
begin; begin;
insert into t values (1),(2); insert into t values (1),(2);
--error 34542 --error 1030
select * from information_schema.tokudb_fractal_tree_info; select * from information_schema.tokudb_fractal_tree_info;
commit; commit;
drop table t; drop table t;
...@@ -1556,7 +1556,7 @@ static int tokudb_file_map_fill_table(THD *thd, TABLE_LIST *tables, COND *cond) ...@@ -1556,7 +1556,7 @@ static int tokudb_file_map_fill_table(THD *thd, TABLE_LIST *tables, COND *cond)
} else { } else {
error = tokudb_file_map(table, thd); error = tokudb_file_map(table, thd);
if (error) if (error)
my_error(error, MYF(0)); my_error(ER_GET_ERRNO, MYF(0), error);
} }
rw_unlock(&tokudb_hton_initialized_lock); rw_unlock(&tokudb_hton_initialized_lock);
...@@ -1705,7 +1705,7 @@ static int tokudb_fractal_tree_info_fill_table(THD *thd, TABLE_LIST *tables, CON ...@@ -1705,7 +1705,7 @@ static int tokudb_fractal_tree_info_fill_table(THD *thd, TABLE_LIST *tables, CON
} else { } else {
error = tokudb_fractal_tree_info(table, thd); error = tokudb_fractal_tree_info(table, thd);
if (error) if (error)
my_error(error, MYF(0)); my_error(ER_GET_ERRNO, MYF(0), error);
} }
//3938: unlock the status flag lock //3938: unlock the status flag lock
...@@ -1920,7 +1920,7 @@ static int tokudb_fractal_tree_block_map_fill_table(THD *thd, TABLE_LIST *tables ...@@ -1920,7 +1920,7 @@ static int tokudb_fractal_tree_block_map_fill_table(THD *thd, TABLE_LIST *tables
} else { } else {
error = tokudb_fractal_tree_block_map(table, thd); error = tokudb_fractal_tree_block_map(table, thd);
if (error) if (error)
my_error(error, MYF(0)); my_error(ER_GET_ERRNO, MYF(0), error);
} }
//3938: unlock the status flag lock //3938: unlock the status flag lock
...@@ -2076,7 +2076,7 @@ static int tokudb_trx_fill_table(THD *thd, TABLE_LIST *tables, COND *cond) { ...@@ -2076,7 +2076,7 @@ static int tokudb_trx_fill_table(THD *thd, TABLE_LIST *tables, COND *cond) {
struct tokudb_trx_extra e = { thd, tables->table }; struct tokudb_trx_extra e = { thd, tables->table };
error = db_env->iterate_live_transactions(db_env, tokudb_trx_callback, &e); error = db_env->iterate_live_transactions(db_env, tokudb_trx_callback, &e);
if (error) if (error)
my_error(error, MYF(0)); my_error(ER_GET_ERRNO, MYF(0), error);
} }
rw_unlock(&tokudb_hton_initialized_lock); rw_unlock(&tokudb_hton_initialized_lock);
...@@ -2163,7 +2163,7 @@ static int tokudb_lock_waits_fill_table(THD *thd, TABLE_LIST *tables, COND *cond ...@@ -2163,7 +2163,7 @@ static int tokudb_lock_waits_fill_table(THD *thd, TABLE_LIST *tables, COND *cond
struct tokudb_lock_waits_extra e = { thd, tables->table }; struct tokudb_lock_waits_extra e = { thd, tables->table };
error = db_env->iterate_pending_lock_requests(db_env, tokudb_lock_waits_callback, &e); error = db_env->iterate_pending_lock_requests(db_env, tokudb_lock_waits_callback, &e);
if (error) if (error)
my_error(error, MYF(0)); my_error(ER_GET_ERRNO, MYF(0), error);
} }
rw_unlock(&tokudb_hton_initialized_lock); rw_unlock(&tokudb_hton_initialized_lock);
...@@ -2254,7 +2254,7 @@ static int tokudb_locks_fill_table(THD *thd, TABLE_LIST *tables, COND *cond) { ...@@ -2254,7 +2254,7 @@ static int tokudb_locks_fill_table(THD *thd, TABLE_LIST *tables, COND *cond) {
struct tokudb_locks_extra e = { thd, tables->table }; struct tokudb_locks_extra e = { thd, tables->table };
error = db_env->iterate_live_transactions(db_env, tokudb_locks_callback, &e); error = db_env->iterate_live_transactions(db_env, tokudb_locks_callback, &e);
if (error) if (error)
my_error(error, MYF(0)); my_error(ER_GET_ERRNO, MYF(0), error);
} }
rw_unlock(&tokudb_hton_initialized_lock); rw_unlock(&tokudb_hton_initialized_lock);
......
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