From a5ad8d15f6370b3929afbf0c2939192db52889a9 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 31 Jan 2013 11:29:58 +0100 Subject: [PATCH 1/2] MDEV-4121: binlog.binlog_row_binlog sporadic test failure Add a wait for binlog checkpoint to avoid thread scheduling giving different binlog order at random. --- mysql-test/extra/binlog_tests/binlog.test | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mysql-test/extra/binlog_tests/binlog.test b/mysql-test/extra/binlog_tests/binlog.test index 5b57eab1005..a74426bdd45 100644 --- a/mysql-test/extra/binlog_tests/binlog.test +++ b/mysql-test/extra/binlog_tests/binlog.test @@ -40,6 +40,9 @@ while ($1) } --enable_query_log commit; +# Make sure binlog checkpoint is logged before DROP TABLE to avoid random +# result difference. +--source include/wait_for_binlog_checkpoint.inc drop table t1; --source include/show_binlog_events.inc --let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1) From ffdbdd7feb0dc4bbb48aa7454168bf36de99d022 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 4 Feb 2013 11:31:05 +0200 Subject: [PATCH 2/2] MDEV-4091: Dynamic columns C functions should be included in libmysqlclient --- libmysql/CMakeLists.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index 29c8298a825..9996b167323 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -222,6 +222,26 @@ dynamic_column_exists dynamic_column_list dynamic_column_get dynamic_column_prepare_decimal +mariadb_dyncol_create_many +mariadb_dyncol_create_many_named +mariadb_dyncol_update_many +mariadb_dyncol_update_many_named +mariadb_dyncol_exists +mariadb_dyncol_exists_named +mariadb_dyncol_list +mariadb_dyncol_list_named +mariadb_dyncol_get +mariadb_dyncol_get_named +mariadb_dyncol_has_names +mariadb_dyncol_check +mariadb_dyncol_json +mariadb_dyncol_val_str +mariadb_dyncol_val_long +mariadb_dyncol_val_double +mariadb_dyncol_unpack +mariadb_dyncol_column_cmp_named +mariadb_dyncol_column_count +mariadb_dyncol_prepare_decimal ) SET(CLIENT_API_FUNCTIONS