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
3f3e058f
Commit
3f3e058f
authored
Nov 19, 2014
by
Rich Prohaska
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DB-762 create tokudb trx when needed in tokudb::start_stmt
parent
588ff21f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
1 deletion
+25
-1
mysql-test/suite/tokudb.bugs/r/db762.result
mysql-test/suite/tokudb.bugs/r/db762.result
+7
-0
mysql-test/suite/tokudb.bugs/t/db762.test
mysql-test/suite/tokudb.bugs/t/db762.test
+13
-0
storage/tokudb/ha_tokudb.cc
storage/tokudb/ha_tokudb.cc
+5
-1
No files found.
mysql-test/suite/tokudb.bugs/r/db762.result
0 → 100644
View file @
3f3e058f
drop table if exists t1,t2;
create table t1 (x int) engine=innodb;
lock table t1 read;
create temporary table t2 (x int) engine=tokudb;
insert into t2 values (1);
unlock tables;
drop table t1, t2;
mysql-test/suite/tokudb.bugs/t/db762.test
0 → 100644
View file @
3f3e058f
# test for DB-762 and DB-767
source
include
/
have_tokudb
.
inc
;
source
include
/
have_innodb
.
inc
;
disable_warnings
;
drop
table
if
exists
t1
,
t2
;
enable_warnings
;
create
table
t1
(
x
int
)
engine
=
innodb
;
lock
table
t1
read
;
create
temporary
table
t2
(
x
int
)
engine
=
tokudb
;
insert
into
t2
values
(
1
);
unlock
tables
;
drop
table
t1
,
t2
;
storage/tokudb/ha_tokudb.cc
View file @
3f3e058f
...
@@ -6227,7 +6227,11 @@ int ha_tokudb::start_stmt(THD * thd, thr_lock_type lock_type) {
...
@@ -6227,7 +6227,11 @@ int ha_tokudb::start_stmt(THD * thd, thr_lock_type lock_type) {
int
error
=
0
;
int
error
=
0
;
tokudb_trx_data
*
trx
=
(
tokudb_trx_data
*
)
thd_get_ha_data
(
thd
,
tokudb_hton
);
tokudb_trx_data
*
trx
=
(
tokudb_trx_data
*
)
thd_get_ha_data
(
thd
,
tokudb_hton
);
DBUG_ASSERT
(
trx
);
if
(
!
trx
)
{
error
=
create_tokudb_trx_data_instance
(
&
trx
);
if
(
error
)
{
goto
cleanup
;
}
thd_set_ha_data
(
thd
,
tokudb_hton
,
trx
);
}
/*
/*
note that trx->stmt may have been already initialized as start_stmt()
note that trx->stmt may have been already initialized as start_stmt()
...
...
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