database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Manual merge from mysql-trunk.

Browse Source 
Conflicts:
  - mysql-test/suite/engines/funcs/t/disabled.def
  - mysql-test/suite/engines/iuds/t/disabled.def
  - mysql-test/suite/engines/iuds/t/insert_number.test
This commit is contained in:
Alexander Nozdrin
2010-05-07 13:37:16 +04:00
parent 21b8741b57 7af6ac8f3e
commit 762b535de2
222 changed files with 5498 additions and 5233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_load.cc
View File

@ -696,7 +696,7 @@ static bool write_execute_load_query_log_event(THD *thd, sql_exchange* ex,
{
if (n++)
pfields.append(", ");
if (item->name)
if (item->type() == Item::FIELD_ITEM)
{
pfields.append("`");
pfields.append(item->name);