bk commit into 5.0 tree (konstantin:1.1940) BUG#8733

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1940 05/05/12 14:42:36 konstantin@stripped +2 -0
  Proposed fix for the select.test failure in 5.0.
  The failure is caused by wrong merge of Bug#8733, which adds a new
  option to SELECT_LEX::options list. In 5.0 all 32 bits of
  SELECT_LEX::options are in use, so SELECT_ALL got bit 33.
  The fix extends ST_SELECT_LEX_UNIT::options to 64 bit.
  

  sql/sql_lex.h
    1.176 05/05/12 14:42:29 konstantin@stripped +3 -1
    Use ulonglong for SELECT_LEX::options. We still can keep THD::options
    32-bit, but I haven't had time to check all uses of SELECT_LEX::options
    for 64-bit safety.

  sql/mysql_priv.h
    1.296 05/05/12 14:42:29 konstantin@stripped +4 -4
    Move wrongly automerged code around.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-root

--- 1.295/sql/mysql_priv.h	2005-05-09 20:44:21 +04:00
+++ 1.296/sql/mysql_priv.h	2005-05-12 14:42:29 +04:00
@@ -220,7 +220,7 @@
 #define TEST_SIGINT		1024	/* Allow sigint on threads */
 #define TEST_SYNCHRONIZATION	2048	/* get server to do sleep in some 
                                                                        places */
-#endif
+#endif /* MYSQL_CLIENT */
 
 /* 
    This is included in the server and in the client.
@@ -268,6 +268,9 @@
 #define OPTION_SCHEMA_TABLE             (1L << 29)
 /* Flag set if setup_tables already done */
 #define OPTION_SETUP_TABLES_DONE        (1L << 30)
+/* If not set then the thread will ignore all warnings with level notes. */
+#define OPTION_SQL_NOTES                (1L << 31)
+
 /* Thr following is used to detect a conflict with DISTINCT
    in the user query has requested */
 #define SELECT_ALL			(ULL(1) << 32)
@@ -280,9 +283,6 @@
 
 /* The rest of the file is included in the server only */
 #ifndef MYSQL_CLIENT
-
-/* If not set then the thread will ignore all warnings with level notes. */
-#define OPTION_SQL_NOTES                (1L << 31)
 
 /* Bits for different SQL modes modes (including ANSI mode) */
 #define MODE_REAL_AS_FLOAT      	1

--- 1.175/sql/sql_lex.h	2005-04-15 20:31:42 +04:00
+++ 1.176/sql/sql_lex.h	2005-05-12 14:42:29 +04:00
@@ -286,6 +286,8 @@
     Base class for st_select_lex (SELECT_LEX) & 
     st_select_lex_unit (SELECT_LEX_UNIT)
 */
+typedef ulonglong select_options_t;
+
 struct st_lex;
 class st_select_lex;
 class st_select_lex_unit;
@@ -296,7 +298,7 @@
     *link_next, **link_prev;          /* list of whole SELECT_LEX */
 public:
 
-  ulong options;
+  select_options_t options;
   /*
     result of this query can't be cached, bit field, can be :
       UNCACHEABLE_DEPENDENT