diff options
| author | unknown <serg@serg.mylan> | 2003-07-01 20:06:57 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-07-01 20:06:57 +0200 |
| commit | 49938821c26bb67de5f41fc6937401c6415bf641 (patch) | |
| tree | bb8f5a3bf21abc7b1570a2e1857786dcaf013c4c /sql/opt_range.cc | |
| parent | e359c56808f66b248eb0453cfa3e5395de47d2f2 (diff) | |
| parent | cc6fc0ea50189050b0478b9d2d28b4867bf77d00 (diff) | |
| download | mariadb-git-49938821c26bb67de5f41fc6937401c6415bf641.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 5704ce6e432..2d949810b63 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -2409,7 +2409,11 @@ QUICK_SELECT *get_quick_select_for_ref(TABLE *table, TABLE_REF *ref) if (!quick) return 0; if (cp_buffer_from_ref(ref)) - return quick; /* empty range */ + { + if (current_thd->fatal_error) + return 0; // End of memory + return quick; // empty range + } QUICK_RANGE *range= new QUICK_RANGE(); if (!range) |