mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-02 05:05:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc


client/mysqltest.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown 2005-09-30 12:36:23 +03:00
commit c8e0432dbd
44 changed files with 70 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sql/sql_base.cc
View file

@ -4787,9 +4787,6 @@ int setup_conds(THD *thd, TABLE_LIST *tables, TABLE_LIST *leaves,
}
DBUG_RETURN(test(thd->net.report_error));
err:
if (arena)
thd->restore_active_arena(arena, &backup);
err_no_arena:
DBUG_RETURN(1);
}