database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge mariadb 5.3->mariadb 5.5

Browse Source
This commit is contained in:
unknown
2012-03-24 18:21:22 +01:00
parent b34cfe9327 f72e0e686b
commit 335de5db18
42 changed files with 893 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_handler.cc
View File

@ -922,7 +922,8 @@ retry:
goto ok;
}
/* Generate values for virtual fields */
update_virtual_fields(thd, table);
if (table->vfield)
update_virtual_fields(thd, table);
if (cond && !cond->val_int())
{
if (thd->is_error())