[Commits] Rev 3498: merge in file:///home/bell/maria/bzr/work-maria-10.0-merge/

sanja at askmonty.org sanja at askmonty.org
Mon Feb 4 12:03:52 EET 2013


At file:///home/bell/maria/bzr/work-maria-10.0-merge/

------------------------------------------------------------
revno: 3498 [merge]
revision-id: sanja at askmonty.org-20130204100326-mz92m3drsr940da6
parent: sergii at pisem.net-20130202115244-yxo5uvbagw33teoa
parent: sanja at askmonty.org-20130204093105-hspsbx2rfbgs3wrd
committer: sanja at askmonty.org
branch nick: work-maria-10.0-merge
timestamp: Mon 2013-02-04 12:03:26 +0200
message:
  merge
modified:
  libmysql/CMakeLists.txt        sp1f-cmakelists.txt-20060831175237-3bbprkzqdl3gopcnlt3evmaikau67bcq
  mysql-test/extra/binlog_tests/binlog.test sp1f-binlog.test-20050223135508-76cdewwz46hwby5kk5g5wmkoxb74yv4y
-------------- next part --------------
=== modified file 'libmysql/CMakeLists.txt'
--- a/libmysql/CMakeLists.txt	2013-01-29 14:10:47 +0000
+++ b/libmysql/CMakeLists.txt	2013-02-04 09:31:05 +0000
@@ -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

=== modified file 'mysql-test/extra/binlog_tests/binlog.test'
--- a/mysql-test/extra/binlog_tests/binlog.test	2012-09-18 12:14:19 +0000
+++ b/mysql-test/extra/binlog_tests/binlog.test	2013-01-31 10:29:58 +0000
@@ -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)



More information about the commits mailing list