database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
into ltantony.xiphis.org:/usr/home/antony/work2/fixme-5.1a


sql/mysql_priv.h:
  Auto merged
This commit is contained in:
unknown
2005-05-13 13:35:17 +01:00
parent 46272fd06b 13122e339d
commit fa30a8c3d0
5 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/mysql_priv.h
View File

@ -268,9 +268,13 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset;
#define OPTION_SCHEMA_TABLE (1L << 29)
/* Flag set if setup_tables already done */
#define OPTION_SETUP_TABLES_DONE (1L << 30)
/* Thr following is used to detect a conflict with DISTINCT
/* Options for select set by the yacc parser (stored in lex->options2). */
/* The following is used to detect a conflict with DISTINCT
in the user query has requested */
#define SELECT_ALL (ULL(1) << 32)
#define SELECT_ALL (1L << 0)
/*
Maximum length of time zone name that we support