diff options
| author | unknown <monty@donna.mysql.com> | 2000-11-20 02:57:02 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-11-20 02:57:02 +0200 |
| commit | 89ee326c1d27f3bee4acba67060a475811ebd842 (patch) | |
| tree | d3f52866508b583c2d4549b66887b4b50aa9fe22 /sql/mysql_priv.h | |
| parent | 5dae19b394e3385c0e48d896fec1174437f2308a (diff) | |
| download | mariadb-git-89ee326c1d27f3bee4acba67060a475811ebd842.tar.gz | |
Bug fix for NATURAL JOIN, Split manual sections and more statistic variables
Docs/manual.texi:
Split BDB into different sections
Added MySQL developers section
Changed an SQL to a SQL
include/my_sys.h:
More statistic variables
libmysql/libmysql.c:
Added option "interactive-timeout"
mysys/mf_tempfile.c:
More statistic variables
mysys/my_static.c:
More statistic variables
sql-bench/crash-me.sh:
Fixed bug in truncate table test
sql-bench/limits/mysql-3.23.cfg:
Updated to crash-me 1.51
sql-bench/limits/mysql.cfg:
Updated to crash-me 1.51
sql/filesort.cc:
More statistics
sql/mysql_priv.h:
More statistics
sql/mysqld.cc:
More statistics
sql/sql_base.cc:
Fix for NATURAL JOIN
sql/sql_delete.cc:
cleanup + Added logging if one doesn't use index
sql/sql_parse.cc:
Logging if one doesn't use index
sql/sql_select.cc:
Logging if one doesn't use index
sql/sql_update.cc:
cleanup + Added logging if one doesn't use index
sql/structs.h:
Fix for NATURAL JOIN
support-files/my-huge.cnf.sh:
Added interactive-timeout to [mysqlhotcopy]
support-files/my-large.cnf.sh:
Added interactive-timeout to [mysqlhotcopy]
support-files/my-medium.cnf.sh:
Added interactive-timeout to [mysqlhotcopy]
support-files/my-small.cnf.sh:
Added interactive-timeout to [mysqlhotcopy]
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 7081c52ad1d..0fe3b725e34 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -160,6 +160,10 @@ void kill_one_thread(THD *thd, ulong id); #define OPTION_QUICK OPTION_BEGIN*2 #define OPTION_QUOTE_SHOW_CREATE OPTION_QUICK*2 +/* The following is set when parsing the query */ +#define OPTION_NO_INDEX_USED OPTION_QUOTE_SHOW_CREATE*2 +#define OPTION_NO_GOOD_INDEX_USED OPTION_NO_INDEX_USED*2 + #define RAID_BLOCK_SIZE 1024 /* BINLOG_DUMP options */ @@ -445,6 +449,7 @@ extern ulong refresh_version,flush_version, thread_id,query_id,opened_tables, delayed_insert_threads, delayed_insert_writes, delayed_rows_in_use,delayed_insert_errors; extern ulong filesort_rows, filesort_range_count, filesort_scan_count; +extern ulong filesort_merge_passes; extern ulong select_range_check_count, select_range_count, select_scan_count; extern ulong select_full_range_join_count,select_full_join_count; extern uint test_flags,select_errors,mysql_port,ha_open_options; @@ -615,6 +620,7 @@ inline bool add_group_to_list(Item *item,bool asc) inline void mark_as_null_row(TABLE *table) { table->null_row=1; + table->status|=STATUS_NULL_ROW; bfill(table->null_flags,table->null_bytes,255); } |