Commit b5764141 authored by Rik Prohaska's avatar Rik Prohaska

DB-829 ignore read uncommitted errors when querying tokudb_fractal_tree_info

parent 51b68e43
...@@ -3,7 +3,8 @@ drop table if exists t; ...@@ -3,7 +3,8 @@ drop table if exists t;
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);
select * from information_schema.tokudb_fractal_tree_info; select dictionary_name from information_schema.tokudb_fractal_tree_info;
ERROR HY000: Got error -30994 from storage engine dictionary_name
./test/t-status
commit; commit;
drop table t; drop table t;
...@@ -7,7 +7,6 @@ enable_warnings; ...@@ -7,7 +7,6 @@ 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 1030 select dictionary_name from information_schema.tokudb_fractal_tree_info;
select * from information_schema.tokudb_fractal_tree_info;
commit; commit;
drop table t; drop table t;
...@@ -1711,6 +1711,8 @@ static int tokudb_fractal_tree_info(TABLE *table, THD *thd) { ...@@ -1711,6 +1711,8 @@ static int tokudb_fractal_tree_info(TABLE *table, THD *thd) {
error = tmp_cursor->c_get(tmp_cursor, &curr_key, &curr_val, DB_NEXT); error = tmp_cursor->c_get(tmp_cursor, &curr_key, &curr_val, DB_NEXT);
if (!error) { if (!error) {
error = tokudb_report_fractal_tree_info_for_db(&curr_key, &curr_val, table, thd); error = tokudb_report_fractal_tree_info_for_db(&curr_key, &curr_val, table, thd);
if (error)
error = 0; // ignore read uncommitted errors
} }
if (!error && thd_killed(thd)) if (!error && thd_killed(thd))
error = ER_QUERY_INTERRUPTED; error = ER_QUERY_INTERRUPTED;
......
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