Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
44f3cddf
Commit
44f3cddf
authored
Oct 08, 2014
by
Rich Prohaska
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DB-736 fix tokudb IS table errors
parent
b8c3131f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
mysql-test/suite/tokudb.bugs/r/tokudb718.result
mysql-test/suite/tokudb.bugs/r/tokudb718.result
+1
-1
mysql-test/suite/tokudb.bugs/t/tokudb718.test
mysql-test/suite/tokudb.bugs/t/tokudb718.test
+1
-1
storage/tokudb/hatoku_hton.cc
storage/tokudb/hatoku_hton.cc
+6
-6
No files found.
mysql-test/suite/tokudb.bugs/r/tokudb718.result
View file @
44f3cddf
...
@@ -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;
mysql-test/suite/tokudb.bugs/t/tokudb718.test
View file @
44f3cddf
...
@@ -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
;
storage/tokudb/hatoku_hton.cc
View file @
44f3cddf
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment