diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-24 00:09:54 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-24 00:09:54 +0200 |
| commit | 5a1e000281e20a8e198e258a13e468e8d02c32d5 (patch) | |
| tree | 6068b9d90b4127b1c3608e29913fa82bf1a1f20e /sql/mysql_priv.h | |
| parent | 2f411c60d97c379a4b364afaa2cc365561ccd2d6 (diff) | |
| parent | 9d0abe79c6dfd173c299bc7d29293124a4b66b0b (diff) | |
| download | mariadb-git-5a1e000281e20a8e198e258a13e468e8d02c32d5.tar.gz | |
Automerge with 5.1
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index efb92108781..5dedbfc3007 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1989,7 +1989,7 @@ extern my_bool opt_slave_compressed_protocol, use_temp_pool; extern ulong slave_exec_mode_options; extern my_bool opt_readonly, lower_case_file_system; extern my_bool opt_enable_named_pipe, opt_sync_frm, opt_allow_suspicious_udfs; -extern my_bool opt_secure_auth; +extern my_bool opt_secure_auth, debug_assert_if_crashed_table; extern char* opt_secure_file_priv; extern my_bool opt_log_slow_admin_statements, opt_log_slow_slave_statements; extern my_bool sp_automatic_privileges, opt_noacl; @@ -2016,7 +2016,7 @@ extern FILE *stderror_file; extern pthread_key(MEM_ROOT**,THR_MALLOC); extern pthread_mutex_t LOCK_mysql_create_db,LOCK_Acl,LOCK_open, LOCK_lock_db, LOCK_mapped_file,LOCK_user_locks, LOCK_status, - LOCK_error_log, LOCK_delayed_insert, LOCK_uuid_generator, + LOCK_error_log, LOCK_delayed_insert, LOCK_short_uuid_generator, LOCK_delayed_status, LOCK_delayed_create, LOCK_crypt, LOCK_timezone, LOCK_slave_list, LOCK_active_mi, LOCK_manager, LOCK_global_read_lock, LOCK_global_system_variables, LOCK_user_conn, |