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

merge

Browse Source
This commit is contained in:
Vladislav Vaintroub
2009-12-25 16:49:21 +01:00
parent 57e3ba292a 85d5a08b51
commit e8bdef8fcd
811 changed files with 20147 additions and 16594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libmysqld/lib_sql.cc
View File

@ -506,6 +506,9 @@ int init_embedded_server(int argc, char **argv, char **groups)
mysql_server_end();
return 1;
}
mysql_data_home= mysql_real_data_home;
mysql_data_home_len= mysql_real_data_home_len;
/* Get default temporary directory */
opt_mysql_tmpdir=getenv("TMPDIR"); /* Use this if possible */
@ -614,7 +617,7 @@ void *create_embedded_thd(int client_flag)
/* TODO - add init_connect command execution */
if (thd->variables.max_join_size == HA_POS_ERROR)
thd->options |= OPTION_BIG_SELECTS;
thd->variables.option_bits |= OPTION_BIG_SELECTS;
thd->proc_info=0; // Remove 'login'
thd->command=COM_SLEEP;
thd->version=refresh_version;