diff options
| author | unknown <monty@mysql.com> | 2004-03-06 10:43:35 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-06 10:43:35 +0200 |
| commit | aa20bd9e8c44fbc14396fa418983b8c515b4e8ad (patch) | |
| tree | 1cf950921cf3e82b17e59b8516f0db0627a429a2 /sql/sql_select.cc | |
| parent | 0b751edc57385e125415a3d0aa8f37ad772e7178 (diff) | |
| download | mariadb-git-aa20bd9e8c44fbc14396fa418983b8c515b4e8ad.tar.gz | |
Ensure that one can't from the command line set a variable too small. (Bug #2710)
Allow one to force lower_case_table_names to 0, even if the file system is case insensitive. This fixes some issues on Mac OS X (Bug #2994)
Added variables "lower_case_file_system", "version_compile_os" and "license"
mysql-test/t/lowercase_table3-master.opt:
Rename: mysql-test/t/lowercase_table2-master.opt -> mysql-test/t/lowercase_table3-master.opt
mysys/my_getopt.c:
Ensure that one can't from the command line set a variable too small (could happen when sub_size was set)
sql/mysql_priv.h:
Added lower_case_file_system
sql/mysqld.cc:
Allow one to force lower_case_table_names to 0, even if the file system is case insensitive
sql/set_var.cc:
Added variable "lower_case_file_system"
Added variable "version_compile_os"
Added variable "license"
sql/set_var.h:
Added support for read only strings
sql/sql_select.cc:
Make join optimizer killable
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index ae493c0cb16..012be95c381 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1374,7 +1374,7 @@ make_join_statistics(JOIN *join,TABLE_LIST *tables,COND *conds, sizeof(POSITION)*join->const_tables); join->best_read=1.0; } - DBUG_RETURN(get_best_combination(join)); + DBUG_RETURN(join->thd->killed || get_best_combination(join)); } @@ -1904,6 +1904,8 @@ find_best(JOIN *join,table_map rest_tables,uint idx,double record_count, ha_rows rec; double tmp; THD *thd= join->thd; + if (thd->killed) // Abort + return; if (!rest_tables) { |