bk commit into 5.1 tree (antony:1.1823)

[Antony T Curtis]

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony 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.1823 05/05/12 18:09:32 antony@stripped +5 -0
  create select_lex.options2 to store more bits

  BitKeeper/etc/logging_ok
    1.295 05/05/12 18:09:29 antony@stripped +1 -0
    Logging to logging@stripped accepted

  sql/sql_yacc.yy
    1.372 05/05/12 18:08:46 antony@stripped +2 -2
    create select_lex.options2 to store more bits

  sql/sql_lex.h
    1.176 05/05/12 18:08:46 antony@stripped +1 -0
    create select_lex.options2 to store more bits

  sql/sql_lex.cc
    1.143 05/05/12 18:08:46 antony@stripped +1 -0
    create select_lex.options2 to store more bits

  sql/mysql_priv.h
    1.296 05/05/12 18:08:45 antony@stripped +6 -2
    create select_lex.options2 to store more bits

# 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:	antony
# Host:	ltantony.xiphis.org
# Root:	/usr/home/antony/work2/fixme-5.1

--- 1.295/sql/mysql_priv.h	2005-05-09 23:45:24 +01:00
+++ 1.296/sql/mysql_priv.h	2005-05-12 18:08:45 +01:00
@@ -268,9 +268,13 @@
 #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 

--- 1.142/sql/sql_lex.cc	2005-04-16 16:57:14 +01:00
+++ 1.143/sql/sql_lex.cc	2005-05-12 18:08:46 +01:00
@@ -134,6 +134,7 @@
   lex->select_lex.link_next= lex->select_lex.slave= lex->select_lex.next= 0;
   lex->select_lex.link_prev= (st_select_lex_node**)&(lex->all_selects_list);
   lex->select_lex.options= 0;
+  lex->select_lex.options2= 0;
   lex->select_lex.init_order();
   lex->select_lex.group_list.empty();
   lex->describe= 0;

--- 1.175/sql/sql_lex.h	2005-04-15 17:31:42 +01:00
+++ 1.176/sql/sql_lex.h	2005-05-12 18:08:46 +01:00
@@ -297,6 +297,7 @@
 public:
 
   ulong options;
+  ulong options2;
   /*
     result of this query can't be cached, bit field, can be :
       UNCACHEABLE_DEPENDENT

--- 1.371/sql/sql_yacc.yy	2005-05-09 17:40:16 +01:00
+++ 1.372/sql/sql_yacc.yy	2005-05-12 18:08:46 +01:00
@@ -4002,7 +4002,7 @@
 	  }
 	| DISTINCT
 	  {
-            if (Select->options & SELECT_ALL)
+            if (Select->options2 & SELECT_ALL)
             {
               yyerror(ER(ER_SYNTAX_ERROR));
               YYABORT;
@@ -4035,7 +4035,7 @@
               yyerror(ER(ER_SYNTAX_ERROR));
               YYABORT;
             }
-            Select->options|= SELECT_ALL; 
+            Select->options2|= SELECT_ALL; 
 	  }
 	;
 

--- 1.294/BitKeeper/etc/logging_ok	2005-05-10 16:35:01 +01:00
+++ 1.295/BitKeeper/etc/logging_ok	2005-05-12 18:09:29 +01:00
@@ -18,6 +18,7 @@
 antony@stripped
 antony@stripped
 antony@stripped
+antony@stripped
 arjen@stripped
 arjen@stripped
 arjen@stripped