diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-10 19:18:47 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-10 19:18:47 +0100 |
| commit | 7a39b1289f6a9391f1bc3f27721ecb843cb463bd (patch) | |
| tree | 1f9cc57666e50ceefdeb2670d280585fa7c316c2 /sql/sql_select.cc | |
| parent | 6b00e6eb2cbee14e6e9510699f57439ed4a8254d (diff) | |
| parent | a41b47631430856ec0916a8398550a6fe057a737 (diff) | |
| download | mariadb-git-7a39b1289f6a9391f1bc3f27721ecb843cb463bd.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/misc/mysql/31700/50-31700
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index e7d778de991..e9751469a19 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -10347,6 +10347,15 @@ do_select(JOIN *join,List<Item> *fields,TABLE *table,Procedure *procedure) error= (*end_select)(join,join_tab,0); if (error == NESTED_LOOP_OK || error == NESTED_LOOP_QUERY_LIMIT) error= (*end_select)(join,join_tab,1); + + /* + If we don't go through evaluate_join_record(), do the counting + here. join->send_records is increased on success in end_send(), + so we don't touch it here. + */ + join->examined_rows++; + join->thd->row_count++; + DBUG_ASSERT(join->examined_rows <= 1); } else if (join->send_row_on_empty_set()) { |