1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

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
This commit is contained in:
unknown
2001-04-25 22:44:57 +03:00
27 changed files with 263 additions and 132 deletions

View File

@@ -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;