diff options
| author | unknown <kostja@bodhi.(none)> | 2007-12-12 18:36:10 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-12-12 18:36:10 +0300 |
| commit | 2be5708a21b425ee70c2fe3bcd5631ecff3b815f (patch) | |
| tree | b28764824a85f53f79f9230601a6470ac02ddebf /sql/sql_select.cc | |
| parent | 8f967bf6ef1a2d0cacb99fb5da16cdd8045e0272 (diff) | |
| parent | 2a0d2fef51219846e51eae8a56b2de45193edc37 (diff) | |
| download | mariadb-git-2be5708a21b425ee70c2fe3bcd5631ecff3b815f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into bodhi.(none):/opt/local/work/mysql-5.1-12713-1
mysql-test/r/grant.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 312da4c8206..3e759b860a8 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -898,7 +898,6 @@ JOIN::optimize() } if (res > 1) { - thd->fatal_error(); error= res; DBUG_PRINT("error",("Error from opt_sum_query")); DBUG_RETURN(1); @@ -14508,6 +14507,7 @@ calc_group_buffer(JOIN *join,ORDER *group) default: /* This case should never be choosen */ DBUG_ASSERT(0); + my_error(ER_OUT_OF_RESOURCES, MYF(0)); join->thd->fatal_error(); } } |