diff options
| author | unknown <lars@mysql.com> | 2005-02-22 13:22:34 +0100 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-02-22 13:22:34 +0100 |
| commit | 6f6bf32afa7aa2876f1ab5e555438f7baf514d42 (patch) | |
| tree | 08c7ae6ff93769414869eccedfcab6468afdd88c /sql/mysqld.cc | |
| parent | 2fb807d1d0a817c177e02cee7b508b6122ce832e (diff) | |
| parent | 7d766fdbeb1418488f99125b510dce5942b7f79f (diff) | |
| download | mariadb-git-6f6bf32afa7aa2876f1ab5e555438f7baf514d42.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index a4a2fd5e1ef..f58b5c15a99 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5623,7 +5623,8 @@ static void mysql_init_variables(void) language_ptr= language; mysql_data_home= mysql_real_data_home; thd_startup_options= (OPTION_UPDATE_LOG | OPTION_AUTO_IS_NULL | - OPTION_BIN_LOG | OPTION_QUOTE_SHOW_CREATE); + OPTION_BIN_LOG | OPTION_QUOTE_SHOW_CREATE | + OPTION_SQL_NOTES); protocol_version= PROTOCOL_VERSION; what_to_log= ~ (1L << (uint) COM_TIME); refresh_version= flush_version= 1L; /* Increments on each reload */ |