database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Manual merge from mysql-trunk-merge.

Browse Source 
Conflicts:
  - mysql-test/extra/rpl_tests/rpl_mixing_engines.inc
  - sql/log.cc
  - sql/mysqld.cc
  - sql/set_var.cc
  - sql/sql_class.h
This commit is contained in:
Alexander Nozdrin
2010-01-28 01:07:44 +03:00
parent 274a193ded 0aa3aee0da
commit c80c4bdeaf
6 changed files with 1644 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_class.h
View File

@ -374,6 +374,7 @@ typedef struct system_variables
ulong group_concat_max_len;
uint binlog_format; ///< binlog format for this thd (see enum_binlog_format)
my_bool binlog_direct_non_trans_update;
uint completion_type;
uint query_cache_type;
uint tx_isolation;