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

5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2014-11-03 17:47:37 +01:00
parent d1ca1c1fae 50556e7e9a
commit 2160646c1d
79 changed files with 302659 additions and 2805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_base.cc
View File

@ -8428,7 +8428,6 @@ bool setup_on_expr(THD *thd, TABLE_LIST *table, bool is_update)
do
{
embedded= embedding;
DBUG_PRINT("XXX", ("check: %s", table->alias));
if (embedded->on_expr)
{
thd->where="on clause";