1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1

into  kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1-merge
This commit is contained in:
thek@kpdesk.mysql.com
2008-04-14 12:58:53 +02:00
21 changed files with 2118 additions and 4860 deletions

View File

@ -2314,9 +2314,6 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
table deletes.
*/
if ((thd->lex->sql_command != SQLCOM_DELETE))
#ifdef NOT_USED
if ((thd->lex->sql_command != SQLCOM_UPDATE))
#endif
{
/*
Get best non-covering ROR-intersection plan and prepare data for