summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xextra/yassl/CMakeLists.txt1
-rw-r--r--mysql-test/r/bdb_notembedded.result35
-rw-r--r--mysql-test/t/bdb_notembedded.test38
-rwxr-xr-xsql/CMakeLists.txt2
-rw-r--r--storage/archive/CMakeLists.txt1
-rw-r--r--storage/blackhole/CMakeLists.txt1
-rw-r--r--storage/csv/CMakeLists.txt1
-rw-r--r--storage/example/CMakeLists.txt1
-rw-r--r--storage/federated/CMakeLists.txt1
-rwxr-xr-xstorage/heap/CMakeLists.txt1
-rwxr-xr-xstorage/innobase/CMakeLists.txt1
-rwxr-xr-xstorage/myisam/CMakeLists.txt1
-rwxr-xr-xstorage/myisammrg/CMakeLists.txt1
-rwxr-xr-xvio/CMakeLists.txt1
14 files changed, 85 insertions, 1 deletions
diff --git a/extra/yassl/CMakeLists.txt b/extra/yassl/CMakeLists.txt
index 26e682cbb0c..ffb72b831af 100755
--- a/extra/yassl/CMakeLists.txt
+++ b/extra/yassl/CMakeLists.txt
@@ -24,4 +24,5 @@ SET(YASSL_SOURCES src/buffer.cpp src/cert_wrapper.cpp src/crypto_wrapper.cpp sr
src/yassl_imp.cpp src/yassl_int.cpp)
IF(NOT SOURCE_SUBLIBS)
ADD_LIBRARY(yassl ${YASSL_SOURCES})
+ ADD_DEPENDENCIES(yassl GenError)
ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/mysql-test/r/bdb_notembedded.result b/mysql-test/r/bdb_notembedded.result
new file mode 100644
index 00000000000..14cb5fad915
--- /dev/null
+++ b/mysql-test/r/bdb_notembedded.result
@@ -0,0 +1,35 @@
+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
diff --git a/mysql-test/t/bdb_notembedded.test b/mysql-test/t/bdb_notembedded.test
new file mode 100644
index 00000000000..24e64ebbfb2
--- /dev/null
+++ b/mysql-test/t/bdb_notembedded.test
@@ -0,0 +1,38 @@
+-- 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
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 77abc4e6fa5..8a943c269fb 100755
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -167,5 +167,5 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
"lex_hash.h;message.rc;message.h;sql_yacc.h;sql_yacc.cc")
ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def)
-ADD_DEPENDENCIES(udf_example strings)
+ADD_DEPENDENCIES(udf_example strings GenError)
TARGET_LINK_LIBRARIES(udf_example strings wsock32)
diff --git a/storage/archive/CMakeLists.txt b/storage/archive/CMakeLists.txt
index 9a1cfe081b6..1c53ad15c07 100644
--- a/storage/archive/CMakeLists.txt
+++ b/storage/archive/CMakeLists.txt
@@ -25,4 +25,5 @@ SET(ARCHIVE_SOURCES azio.c ha_archive.cc ha_archive.h)
IF(NOT SOURCE_SUBLIBS)
ADD_LIBRARY(archive ${ARCHIVE_SOURCES})
+ ADD_DEPENDENCIES(archive GenError)
ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/storage/blackhole/CMakeLists.txt b/storage/blackhole/CMakeLists.txt
index 9b6dd7adac9..b11330db255 100644
--- a/storage/blackhole/CMakeLists.txt
+++ b/storage/blackhole/CMakeLists.txt
@@ -24,4 +24,5 @@ SET(BLACKHOLE_SOURCES ha_blackhole.cc ha_blackhole.h)
IF(NOT SOURCE_SUBLIBS)
ADD_LIBRARY(blackhole ${BLACKHOLE_SOURCES})
+ ADD_DEPENDENCIES(blackhole GenError)
ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/storage/csv/CMakeLists.txt b/storage/csv/CMakeLists.txt
index bb0df45e5f4..528b9928c76 100644
--- a/storage/csv/CMakeLists.txt
+++ b/storage/csv/CMakeLists.txt
@@ -24,4 +24,5 @@ SET(CSV_SOURCES ha_tina.cc ha_tina.h transparent_file.cc transparent_file.h)
IF(NOT SOURCE_SUBLIBS)
ADD_LIBRARY(csv ${CSV_SOURCES})
+ ADD_DEPENDENCIES(csv GenError)
ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/storage/example/CMakeLists.txt b/storage/example/CMakeLists.txt
index 99c223f3f85..0af60e1df83 100644
--- a/storage/example/CMakeLists.txt
+++ b/storage/example/CMakeLists.txt
@@ -24,4 +24,5 @@ SET(EXAMPLE_SOURCES ha_example.cc)
IF(NOT SOURCE_SUBLIBS)
ADD_LIBRARY(example ${EXAMPLE_SOURCES})
+ ADD_DEPENDENCIES(example GenError)
ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/storage/federated/CMakeLists.txt b/storage/federated/CMakeLists.txt
index 62064a633b1..b96f68a3c37 100644
--- a/storage/federated/CMakeLists.txt
+++ b/storage/federated/CMakeLists.txt
@@ -24,4 +24,5 @@ SET(FEDERATED_SOURCES ha_federated.cc)
IF(NOT SOURCE_SUBLIBS)
ADD_LIBRARY(federated ${FEDERATED_SOURCES})
+ ADD_DEPENDENCIES(federated GenError)
ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/storage/heap/CMakeLists.txt b/storage/heap/CMakeLists.txt
index fd3ce149b2c..f8f0aa91464 100755
--- a/storage/heap/CMakeLists.txt
+++ b/storage/heap/CMakeLists.txt
@@ -29,4 +29,5 @@ SET(HEAP_SOURCES _check.c _rectest.c hp_block.c hp_clear.c hp_close.c hp_create
IF(NOT SOURCE_SUBLIBS)
ADD_LIBRARY(heap ${HEAP_SOURCES})
+ ADD_DEPENDENCIES(heap GenError)
ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
index 47b1a566cd8..c4246abd30d 100755
--- a/storage/innobase/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
@@ -58,4 +58,5 @@ SET(INNOBASE_SOURCES btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c
IF(NOT SOURCE_SUBLIBS)
ADD_LIBRARY(innobase ${INNOBASE_SOURCES})
+ ADD_DEPENDENCIES(innobase GenError)
ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/storage/myisam/CMakeLists.txt b/storage/myisam/CMakeLists.txt
index 9d91bf0560a..4436c8fa7c4 100755
--- a/storage/myisam/CMakeLists.txt
+++ b/storage/myisam/CMakeLists.txt
@@ -37,6 +37,7 @@ SET(MYISAM_SOURCES ft_boolean_search.c ft_nlq_search.c ft_parser.c ft_static.c
IF(NOT SOURCE_SUBLIBS)
ADD_LIBRARY(myisam ${MYISAM_SOURCES})
+ ADD_DEPENDENCIES(myisam GenError)
ADD_EXECUTABLE(myisam_ftdump myisam_ftdump.c)
TARGET_LINK_LIBRARIES(myisam_ftdump myisam mysys debug dbug strings zlib wsock32)
diff --git a/storage/myisammrg/CMakeLists.txt b/storage/myisammrg/CMakeLists.txt
index 848f2dfea43..403ca6c2776 100755
--- a/storage/myisammrg/CMakeLists.txt
+++ b/storage/myisammrg/CMakeLists.txt
@@ -30,4 +30,5 @@ SET(MYISAMMRG_SOURCES myrg_close.c myrg_create.c myrg_delete.c myrg_extra.c myr
IF(NOT SOURCE_SUBLIBS)
ADD_LIBRARY(myisammrg ${MYISAMMRG_SOURCES})
+ ADD_DEPENDENCIES(myisammrg GenError)
ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/vio/CMakeLists.txt b/vio/CMakeLists.txt
index 83cd6f65e6d..164bcde7c4b 100755
--- a/vio/CMakeLists.txt
+++ b/vio/CMakeLists.txt
@@ -23,5 +23,6 @@ SET(VIO_SOURCES vio.c viosocket.c viossl.c viosslfactories.c)
IF(NOT SOURCE_SUBLIBS)
ADD_LIBRARY(vio ${VIO_SOURCES})
+ ADD_DEPENDENCIES(vio GenError)
ENDIF(NOT SOURCE_SUBLIBS)
View Lorry Controller Status