diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-06-30 13:23:54 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-06-30 13:23:54 +0300 |
| commit | d0dc9e7db36d3dc81aaecd761bed47bb63878108 (patch) | |
| tree | 8435e8821801b31bb1a8f3ff592b231e06a8be3e /sql/table.cc | |
| parent | 27205cc64ba607babf4510ef712f021337968df7 (diff) | |
| download | mariadb-git-d0dc9e7db36d3dc81aaecd761bed47bb63878108.tar.gz | |
Remove FORCE_INIT_OF_VARS when compiling for valgrind/purify to spot wrong LINT_INIT() options
Fixed bug in ALTER TABLE ... MODIFY integer-column
Added ref_or_null optimization (needed for subqueries)
BUILD/compile-pentium-valgrind-max:
Remove FORCE_INIT_OF_VARS to spot wrong LINT_INIT() options
mysql-test/r/distinct.result:
Update of test results (new optimizer)
mysql-test/r/null_key.result:
Update after ref_or_null optimization
mysql-test/r/subselect.result:
Update after ref_or_null optimization
mysql-test/t/null_key.test:
New tests for ref_or_null optimization
sql/sql_select.cc:
Added ref_or_null optimization
Optimized find_best_combinations() and read-functions
sql/sql_select.h:
Added ref_or_null optimization
sql/sql_yacc.yy:
Fixed bug in ALTER TABLE ... MODIFY integer-column
sql/table.cc:
Safety fix for ALTER TABLE .. MODIFY
sql/unireg.cc:
Safety fix for ALTER TABLE .. MODIFY
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 908d6807450..0fc2a09f749 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -395,7 +395,9 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, } else { - if (!(charset=get_charset((uint) strpos[14], MYF(0)))) + if (!strpos[14]) + charset= &my_charset_bin; + else if (!(charset=get_charset((uint) strpos[14], MYF(0)))) charset= (outparam->table_charset ? outparam->table_charset: default_charset_info); } |