diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /sql/sql_cursor.cc | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'sql/sql_cursor.cc')
| -rw-r--r-- | sql/sql_cursor.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_cursor.cc b/sql/sql_cursor.cc index 96a2d50538b..7350618adc0 100644 --- a/sql/sql_cursor.cc +++ b/sql/sql_cursor.cc @@ -329,7 +329,7 @@ void Materialized_cursor::fetch(ulong num_rows) If network write failed (i.e. due to a closed socked), the error has already been set. Just return. */ - if (result->send_data(item_list)) + if (result->send_data(item_list) > 0) return; } @@ -386,7 +386,7 @@ bool Select_materialize::send_result_set_metadata(List<Item> &list, uint flags) if (create_result_table(unit->thd, unit->get_unit_column_types(), FALSE, thd->variables.option_bits | TMP_TABLE_ALL_COLUMNS, - "", FALSE)) + "", FALSE, TRUE)) return TRUE; materialized_cursor= new (&table->mem_root) |