database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge

Browse Source 
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/type_ranges.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/type_ranges.result:
  Update results
This commit is contained in:
unknown
2005-04-04 08:54:36 -07:00
parent d17aebaa10 10e2581f4d
commit bee2a64d0b
73 changed files with 757 additions and 8122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_select.cc
View File

@ -7465,7 +7465,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;