mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Fixed during review of new pulled code
extra/perror.c: Use strmov() instead of strcpy() Indentation fixes sql/sql_table.cc: Revert back part of the old code as the new code didn't use mysql_data_home, which would have caused problems in the embedded server sql/sql_update.cc: Ensure that used_index is always set (It has to be set because it's value is tested if order != 0)
This commit is contained in:
@@ -167,7 +167,10 @@ int mysql_update(THD *thd,
|
||||
else if ((used_index=table->file->key_used_on_scan) < MAX_KEY)
|
||||
used_key_is_modified=check_if_key_used(table, used_index, fields);
|
||||
else
|
||||
{
|
||||
used_key_is_modified=0;
|
||||
used_index= MAX_KEY;
|
||||
}
|
||||
if (used_key_is_modified || order)
|
||||
{
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user