summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <pem@mysql.com>2003-12-09 19:00:34 +0100
committerunknown <pem@mysql.com>2003-12-09 19:00:34 +0100
commitaaac51ea982b0502b9b51159afd86eebb7907b47 (patch)
tree15f177a04c15fd53595b54082b1d6199956cbef6 /include
parent8b915a43166e8aa914698a61a9079d3667452d65 (diff)
parent9388c419531adee2ce0ef0113f957dc013b81d49 (diff)
downloadmariadb-git-aaac51ea982b0502b9b51159afd86eebb7907b47.tar.gz
Merged 4.1 -> 5.0
include/mysql_com.h: Auto merged libmysqld/lib_sql.cc: Auto merged myisam/mi_check.c: Auto merged scripts/mysql_install_db.sh: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/protocol.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_show.cc: Auto merged sql/share/czech/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/sql_table.cc: Auto merged sql/sql_select.cc: Auto merged
Diffstat (limited to 'include')
-rw-r--r--include/mysql_com.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 0c4a3e5fca9..3e91670cf9e 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -124,6 +124,8 @@ enum enum_server_command
#define SERVER_STATUS_AUTOCOMMIT 2 /* Server in auto_commit mode */
#define SERVER_STATUS_MORE_RESULTS 4 /* More results on server */
#define SERVER_MORE_RESULTS_EXISTS 8 /* Multi query - next query exists */
+#define SERVER_QUERY_NO_GOOD_INDEX_USED 16
+#define SERVER_QUERY_NO_INDEX_USED 32
#define MYSQL_ERRMSG_SIZE 512
#define NET_READ_TIMEOUT 30 /* Timeout on read */