diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-10 18:44:40 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-10 18:44:40 +0100 |
| commit | b25bf95fc8625ccd56018a652339132f17f63813 (patch) | |
| tree | c25926216c88e27ffb5b313e9a58df85d4c1d047 /sql/sql_select.cc | |
| parent | f97b8e48b8f6ec290f7cc7ca3fe59c33f7cb0d9e (diff) | |
| parent | a41b47631430856ec0916a8398550a6fe057a737 (diff) | |
| download | mariadb-git-b25bf95fc8625ccd56018a652339132f17f63813.tar.gz | |
Merge mysql.com:/misc/mysql/31700/50-31700
into mysql.com:/misc/mysql/31700/51-31700
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
manual merge
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 140daf8b55d..f457f3abbaf 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -10648,6 +10648,15 @@ do_select(JOIN *join,List<Item> *fields,TABLE *table,Procedure *procedure) error= (*end_select)(join, 0, 0); if (error == NESTED_LOOP_OK || error == NESTED_LOOP_QUERY_LIMIT) error= (*end_select)(join, 0, 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()) { |