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
9473b90f
Commit
9473b90f
authored
Oct 07, 2007
by
monty@narttu.mysql.fi
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
parents
571200d4
5dcb6488
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
82 additions
and
8 deletions
+82
-8
client/mysql_upgrade.c
client/mysql_upgrade.c
+1
-1
client/mysqlcheck.c
client/mysqlcheck.c
+1
-1
client/mysqldump.c
client/mysqldump.c
+1
-1
client/mysqlimport.c
client/mysqlimport.c
+1
-1
client/mysqlshow.c
client/mysqlshow.c
+1
-1
client/mysqlslap.c
client/mysqlslap.c
+1
-1
client/mysqltest.c
client/mysqltest.c
+1
-1
mysql-test/r/bdb_notembedded.result
mysql-test/r/bdb_notembedded.result
+35
-0
mysql-test/t/bdb_notembedded.test
mysql-test/t/bdb_notembedded.test
+38
-0
sql/handler.cc
sql/handler.cc
+2
-1
No files found.
client/mysql_upgrade.c
View file @
9473b90f
...
...
@@ -74,7 +74,7 @@ static struct my_option my_long_options[]=
{
"debug"
,
'#'
,
"Output debug log"
,
(
uchar
*
*
)
&
default_dbug_option
,
(
uchar
*
*
)
&
default_dbug_option
,
0
,
GET_STR
,
OPT_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
#endif
{
"debug-check"
,
OPT_DEBUG_CHECK
,
"Check memory and open file usage at exit
."
,
{
"debug-check"
,
OPT_DEBUG_CHECK
,
"Check memory and open file usage at exit."
,
(
uchar
**
)
&
debug_check_flag
,
(
uchar
**
)
&
debug_check_flag
,
0
,
GET_BOOL
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"debug-info"
,
'T'
,
"Print some debug info at exit."
,
(
uchar
**
)
&
debug_info_flag
,
...
...
client/mysqlcheck.c
View file @
9473b90f
...
...
@@ -97,7 +97,7 @@ static struct my_option my_long_options[] =
{
"debug"
,
'#'
,
"Output debug log. Often this is 'd:t:o,filename'."
,
0
,
0
,
0
,
GET_STR
,
OPT_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
#endif
{
"debug-check"
,
OPT_DEBUG_CHECK
,
"Check memory and open file usage at exit
."
,
{
"debug-check"
,
OPT_DEBUG_CHECK
,
"Check memory and open file usage at exit."
,
(
uchar
**
)
&
debug_check_flag
,
(
uchar
**
)
&
debug_check_flag
,
0
,
GET_BOOL
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"debug-info"
,
OPT_DEBUG_INFO
,
"Print some debug info at exit."
,
...
...
client/mysqldump.c
View file @
9473b90f
...
...
@@ -243,7 +243,7 @@ static struct my_option my_long_options[] =
{
"debug"
,
'#'
,
"Output debug log"
,
(
uchar
**
)
&
default_dbug_option
,
(
uchar
**
)
&
default_dbug_option
,
0
,
GET_STR
,
OPT_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
#endif
{
"debug-check"
,
OPT_DEBUG_CHECK
,
"Check memory and open file usage at exit
."
,
{
"debug-check"
,
OPT_DEBUG_CHECK
,
"Check memory and open file usage at exit."
,
(
uchar
**
)
&
debug_check_flag
,
(
uchar
**
)
&
debug_check_flag
,
0
,
GET_BOOL
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"debug-info"
,
OPT_DEBUG_INFO
,
"Print some debug info at exit."
,
...
...
client/mysqlimport.c
View file @
9473b90f
...
...
@@ -87,7 +87,7 @@ static struct my_option my_long_options[] =
0
,
0
,
0
},
{
"debug"
,
'#'
,
"Output debug log. Often this is 'd:t:o,filename'."
,
0
,
0
,
0
,
GET_STR
,
OPT_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"debug-check"
,
OPT_DEBUG_CHECK
,
"Check memory and open file usage at exit
."
,
{
"debug-check"
,
OPT_DEBUG_CHECK
,
"Check memory and open file usage at exit."
,
(
uchar
**
)
&
debug_check_flag
,
(
uchar
**
)
&
debug_check_flag
,
0
,
GET_BOOL
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"debug-info"
,
OPT_DEBUG_INFO
,
"Print some debug info at exit."
,
...
...
client/mysqlshow.c
View file @
9473b90f
...
...
@@ -178,7 +178,7 @@ static struct my_option my_long_options[] =
0
,
0
,
0
},
{
"debug"
,
'#'
,
"Output debug log. Often this is 'd:t:o,filename'."
,
0
,
0
,
0
,
GET_STR
,
OPT_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"debug-check"
,
OPT_DEBUG_CHECK
,
"Check memory and open file usage at exit
."
,
{
"debug-check"
,
OPT_DEBUG_CHECK
,
"Check memory and open file usage at exit."
,
(
uchar
**
)
&
debug_check_flag
,
(
uchar
**
)
&
debug_check_flag
,
0
,
GET_BOOL
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"debug-info"
,
OPT_DEBUG_INFO
,
"Print some debug info at exit."
,
...
...
client/mysqlslap.c
View file @
9473b90f
...
...
@@ -568,7 +568,7 @@ static struct my_option my_long_options[] =
{
"debug"
,
'#'
,
"Output debug log. Often this is 'd:t:o,filename'."
,
(
uchar
**
)
&
default_dbug_option
,
(
uchar
**
)
&
default_dbug_option
,
0
,
GET_STR
,
OPT_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"debug-check"
,
OPT_DEBUG_CHECK
,
"Check memory and open file usage at exit
."
,
{
"debug-check"
,
OPT_DEBUG_CHECK
,
"Check memory and open file usage at exit."
,
(
uchar
**
)
&
debug_check_flag
,
(
uchar
**
)
&
debug_check_flag
,
0
,
GET_BOOL
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"debug-info"
,
'T'
,
"Print some debug info at exit."
,
(
uchar
**
)
&
debug_info_flag
,
...
...
client/mysqltest.c
View file @
9473b90f
...
...
@@ -4924,7 +4924,7 @@ static struct my_option my_long_options[] =
{
"debug"
,
'#'
,
"Output debug log. Often this is 'd:t:o,filename'."
,
0
,
0
,
0
,
GET_STR
,
OPT_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
#endif
{
"debug-check"
,
OPT_DEBUG_CHECK
,
"Check memory and open file usage at exit
."
,
{
"debug-check"
,
OPT_DEBUG_CHECK
,
"Check memory and open file usage at exit."
,
(
uchar
**
)
&
debug_check_flag
,
(
uchar
**
)
&
debug_check_flag
,
0
,
GET_BOOL
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"debug-info"
,
OPT_DEBUG_INFO
,
"Print some debug info at exit."
,
...
...
mysql-test/r/bdb_notembedded.result
0 → 100644
View file @
9473b90f
set autocommit=1;
reset master;
create table bug16206 (a int);
insert into bug16206 values(1);
start transaction;
insert into bug16206 values(2);
commit;
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
f n Format_desc 1 n Server ver: VERSION, Binlog ver: 4
f n Query 1 n use `test`; create table bug16206 (a int)
f n Query 1 n use `test`; insert into bug16206 values(1)
f n Query 1 n use `test`; insert into bug16206 values(2)
drop table bug16206;
reset master;
create table bug16206 (a int) engine= bdb;
insert into bug16206 values(0);
insert into bug16206 values(1);
start transaction;
insert into bug16206 values(2);
commit;
insert into bug16206 values(3);
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
f n Format_desc 1 n Server ver: VERSION, Binlog ver: 4
f n Query 1 n use `test`; create table bug16206 (a int) engine= bdb
f n Query 1 n use `test`; insert into bug16206 values(0)
f n Query 1 n use `test`; insert into bug16206 values(1)
f n Query 1 n use `test`; BEGIN
f n Query 1 n use `test`; insert into bug16206 values(2)
f n Query 1 n use `test`; COMMIT
f n Query 1 n use `test`; insert into bug16206 values(3)
drop table bug16206;
set autocommit=0;
End of 5.0 tests
mysql-test/t/bdb_notembedded.test
0 → 100644
View file @
9473b90f
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_bdb
.
inc
#
# Bug #16206: Superfluous COMMIT event in binlog when updating BDB in autocommit mode
#
set
autocommit
=
1
;
let
$VERSION
=
`select version()`
;
reset
master
;
create
table
bug16206
(
a
int
);
insert
into
bug16206
values
(
1
);
start
transaction
;
insert
into
bug16206
values
(
2
);
commit
;
--
replace_result
$VERSION
VERSION
--
replace_column
1
f
2
n
5
n
show
binlog
events
;
drop
table
bug16206
;
reset
master
;
create
table
bug16206
(
a
int
)
engine
=
bdb
;
insert
into
bug16206
values
(
0
);
insert
into
bug16206
values
(
1
);
start
transaction
;
insert
into
bug16206
values
(
2
);
commit
;
insert
into
bug16206
values
(
3
);
--
replace_result
$VERSION
VERSION
--
replace_column
1
f
2
n
5
n
show
binlog
events
;
drop
table
bug16206
;
set
autocommit
=
0
;
--
echo
End
of
5.0
tests
sql/handler.cc
View file @
9473b90f
...
...
@@ -2502,8 +2502,9 @@ int handler::ha_repair(THD* thd, HA_CHECK_OPT* check_opt)
int
ha_enable_transaction
(
THD
*
thd
,
bool
on
)
{
int
error
=
0
;
DBUG_ENTER
(
"ha_enable_transaction"
);
DBUG_PRINT
(
"enter"
,
(
"on: %d"
,
(
int
)
on
));
thd
->
transaction
.
on
=
on
;
if
(
on
)
{
...
...
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