diff options
| author | unknown <jimw@mysql.com> | 2005-04-01 16:43:35 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-04-01 16:43:35 -0800 |
| commit | dd882cfb640d924459d1c8a84fe0fb1f7741f549 (patch) | |
| tree | 2375dec2cc48d78c721a7cdfe8ceb3fc7f6474e3 /sql | |
| parent | 0ac7d26b74353ac075b67ba63182c6dd5364000b (diff) | |
| parent | 3b82560b959def5b5dfc1f6d5b9fee061890664f (diff) | |
| download | mariadb-git-dd882cfb640d924459d1c8a84fe0fb1f7741f549.tar.gz | |
Merge embedded-server testing changes.
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/select.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/type_float.test:
Auto merged
mysql-test/t/user_var.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/mysql-test-run.sh:
Merge changes
mysql-test/t/ps_1general.test:
Merge changes
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 3c66574231d..0d1021ec9af 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -4485,7 +4485,7 @@ remove_eq_conds(THD *thd, COND *cond, Item::cond_result *cond_value) (thd->options & OPTION_AUTO_IS_NULL) && thd->insert_id()) { -#ifndef EMBEDDED_LIBRARY +#ifdef HAVE_QUERY_CACHE query_cache_abort(&thd->net); #endif COND *new_cond; |