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

Conflicts resolving

This commit is contained in:
hf@deer.mysql.r18.ru
2003-01-20 18:59:45 +04:00
245 changed files with 21922 additions and 1429 deletions

View File

@ -195,7 +195,6 @@ void THD::init(void)
pthread_mutex_unlock(&LOCK_global_system_variables);
server_status= SERVER_STATUS_AUTOCOMMIT;
options= thd_startup_options;
sql_mode=(uint) opt_sql_mode;
open_options=ha_open_options;
update_lock_default= (variables.low_priority_updates ?
TL_WRITE_LOW_PRIORITY :