database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merging 4.1 into 5.0 (second pass; post-merge fixes).

Browse Source 
One test in subselect.test still wrong.
Had to reconstruct all errmsg.txt files completely, since auto-merge made
a mess of the lot. :-(
This commit is contained in:
pem@mysql.telia.com
2003-07-09 17:07:12 +02:00
parent 9c3a7a6ba3
commit a8a29a39d2
40 changed files with 836 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_cache.cc
View File

@@ -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;