1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a core dump that occured on AIX and Solaris (and probably others)

Browse Source 
in get_options (thanks to Sinisa for fixing this)
This commit is contained in:
lenz@mysql.com 2002-07-16 22:26:29 +02:00
parent 8a4502f19b
commit 2877dc2f1c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/mysqld.cc
View File

@ -4493,17 +4493,17 @@ static void get_options(int argc,char **argv)
default_table_type_name=ha_table_typelib.type_names[default_table_type-1]; default_table_type_name=ha_table_typelib.type_names[default_table_type-1];
default_tx_isolation_name=tx_isolation_typelib.type_names[default_tx_isolation]; default_tx_isolation_name=tx_isolation_typelib.type_names[default_tx_isolation];
/* To be deleted in MySQL 4.0 */ /* To be deleted in MySQL 4.0 */
if (!thd->variables.record_rnd_cache_size) if (thd && !thd->variables.record_rnd_cache_size)
thd->variables.record_rnd_cache_size= my_default_record_cache_size; thd->variables.record_rnd_cache_size= my_default_record_cache_size;
/* Fix variables that are base 1024*1024 */ /* Fix variables that are base 1024*1024 */
myisam_max_temp_length= myisam_max_temp_length=
(my_off_t) min(((ulonglong) (my_off_t) min(((ulonglong)
thd->variables.myisam_max_sort_file_size)*1024 * 1024, global_system_variables.myisam_max_sort_file_size)*1024 * 1024,
(ulonglong) MAX_FILE_SIZE); (ulonglong) MAX_FILE_SIZE);
myisam_max_extra_temp_length= myisam_max_extra_temp_length=
(my_off_t) min(((ulonglong) (my_off_t) min(((ulonglong)
thd->variables.myisam_max_extra_sort_file_size)*1024*1024, global_system_variables.myisam_max_extra_sort_file_size)*1024*1024,
(ulonglong) MAX_FILE_SIZE); (ulonglong) MAX_FILE_SIZE);
myisam_block_size=(uint) 1 << my_bit_log2(opt_myisam_block_size); myisam_block_size=(uint) 1 << my_bit_log2(opt_myisam_block_size);