diff options
| author | unknown <monty@donna.mysql.fi> | 2001-04-25 22:44:57 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-04-25 22:44:57 +0300 |
| commit | 6ca7bfb9e0304b63b374eadc270ba25fe15c59a3 (patch) | |
| tree | 423d50939ffecb0332aa31928804fc8a06a5dd45 /sql/sql_class.h | |
| parent | d909ccb6dc7805616e299cc2014af50e0540fd53 (diff) | |
| parent | 97907ee8d723a9143734655151153e2c6243ab28 (diff) | |
| download | mariadb-git-6ca7bfb9e0304b63b374eadc270ba25fe15c59a3.tar.gz | |
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/log.cc:
Auto merged
sql/mysqlbinlog.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index f7dc799113e..438898ca294 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -268,7 +268,7 @@ public: #endif ulonglong next_insert_id,last_insert_id,current_insert_id; ha_rows select_limit,offset_limit,default_select_limit,cuted_fields, - max_join_size,sent_row_count; + max_join_size, sent_row_count, examined_row_count; table_map used_tables; ulong query_id,version, inactive_timeout,options,thread_id; ulong gemini_spin_retries; |