diff options
| author | unknown <pem@mysql.telia.com> | 2003-07-09 17:07:12 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.telia.com> | 2003-07-09 17:07:12 +0200 |
| commit | 2b16d5457b88f5c0b6099fd38b528a2387978ecd (patch) | |
| tree | fc5af9e05add5785624aae361d66dd5026c625fa /sql/sql_cache.cc | |
| parent | d6b336359abd85b0bbd474777bed552e015747fc (diff) | |
| download | mariadb-git-2b16d5457b88f5c0b6099fd38b528a2387978ecd.tar.gz | |
Merging 4.1 into 5.0 (second pass; post-merge fixes).
One test in subselect.test still wrong.
Had to reconstruct all errmsg.txt files completely, since auto-merge made
a mess of the lot. :-(
mysql-test/r/sp-error.result:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
mysql-test/r/subselect.result:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
One test still wrong (different from 4.1), left for Sanja. :)
mysql-test/r/variables.result:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
mysql-test/t/sp-error.test:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
mysql-test/t/subselect.test:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
One test still wrong (different from 4.1), left for Sanja :)
scripts/mysql_create_system_tables.sh:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item.cc:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item_cmpfunc.cc:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item_subselect.cc:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item_sum.cc:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/mysql_priv.h:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/mysqld.cc:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/danish/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/dutch/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/english/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/estonian/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/french/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/german/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/greek/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/hungarian/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/italian/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/japanese/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/korean/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/norwegian-ny/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/norwegian/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/polish/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/portuguese/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/russian/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/serbian/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/slovak/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/spanish/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/swedish/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/ukrainian/errmsg.txt:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sp.cc:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_base.cc:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_cache.cc:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_insert.cc:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_parse.cc:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_select.cc:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_update.cc:
Merging 4.1 into 5.0 (second pass; post-merge fixes).
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index d483cceb562..c77d9c1f0b0 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -761,7 +761,7 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used) uint8 tables_type= 0; if ((local_tables = is_cacheable(thd, thd->query_length, - thd->query, &thd->lex, tables_used, + thd->query, thd->lex, tables_used, &tables_type))) { NET *net= &thd->net; |