database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
unknown
2013-02-04 12:04:29 +02:00
parent f0b6f7fb20 ffdbdd7feb
commit a3e64c8616
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libmysql/CMakeLists.txt
View File

@@ -222,6 +222,26 @@ dynamic_column_exists
dynamic_column_list dynamic_column_list
dynamic_column_get dynamic_column_get
dynamic_column_prepare_decimal 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 SET(CLIENT_API_FUNCTIONS

3
mysql-test/extra/binlog_tests/binlog.test
View File

@@ -40,6 +40,9 @@ while ($1)
} }
--enable_query_log --enable_query_log
commit; 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; drop table t1;
--source include/show_binlog_events.inc --source include/show_binlog_events.inc
--let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1) --let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)