bk commit into 5.0 tree (malff:1.2237)

[marc.alff]

Below is the list of changes that have just been committed into a local
5.0 repository of marcsql. When marcsql 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@stripped, 2006-08-18 19:16:07-07:00, malff@weblab.(none) +5 -0
  WL#3432 (Compile the Parser with a --debug --verbose option)
  
  Corrected build issues : the build can not be conditional.
  to keep a unique source .tar.gz distribution.

  configure.in@stripped, 2006-08-18 18:45:36-07:00, malff@weblab.(none) +0 -1
    Rolling back previous change

  sql/Makefile.am@stripped, 2006-08-18 18:45:36-07:00, malff@weblab.(none) +1 -5
    Partially rolling back previous change.
    The build has to be unconditional, for the source .tar.gz distribution

  sql/mysql_priv.h@stripped, 2006-08-18 18:45:36-07:00, malff@weblab.(none) +3 -0
    WL#3432 (Compile the Parser with a --debug --verbose option)

  sql/sql_parse.cc@stripped, 2006-08-18 18:45:36-07:00, malff@weblab.(none) +0 -21
    WL#3432 (Compile the Parser with a --debug --verbose option)
    
    Moved turn_parser_debug_on to sql_yacc.yy

  sql/sql_yacc.yy@stripped, 2006-08-18 18:45:36-07:00, malff@weblab.(none) +28 -0
    WL#3432 (Compile the Parser with a --debug --verbose option)
    
    Moved turn_parser_debug_on to sql_yacc.yy

# 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:	malff
# Host:	weblab.(none)
# Root:	/home/marcsql/TREE/mysql-5.0-WL3432

--- 1.407/configure.in	2006-08-18 19:16:12 -07:00
+++ 1.408/configure.in	2006-08-18 19:16:12 -07:00
@@ -1667,7 +1667,6 @@ else
   CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"
   CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"
 fi
-AM_CONDITIONAL(MYSQL_CONF_DEBUG, test "x$with_debug" != "xno")
 
 # Force static compilation to avoid linking problems/get more speed
 AC_ARG_WITH(mysqld-ldflags,

--- 1.120/sql/Makefile.am	2006-08-18 19:16:12 -07:00
+++ 1.121/sql/Makefile.am	2006-08-18 19:16:12 -07:00
@@ -119,11 +119,7 @@ BUILT_SOURCES =		sql_yacc.cc sql_yacc.h 
 EXTRA_DIST =		$(BUILT_SOURCES)
 DISTCLEANFILES =        lex_hash.h sql_yacc.output
 
-AM_YFLAGS =		-d
-
-if MYSQL_CONF_DEBUG
-AM_YFLAGS +=		--debug --verbose
-endif
+AM_YFLAGS =		-d --debug --verbose
 
 mysql_tzinfo_to_sql.cc:
 	rm -f mysql_tzinfo_to_sql.cc

--- 1.403/sql/mysql_priv.h	2006-08-18 19:16:12 -07:00
+++ 1.404/sql/mysql_priv.h	2006-08-18 19:16:12 -07:00
@@ -1501,6 +1501,9 @@ void free_list(I_List <i_string> *list);
 
 /* sql_yacc.cc */
 extern int MYSQLparse(void *thd);
+#ifndef DBUG_OFF
+extern void turn_parser_debug_on();
+#endif
 
 /* frm_crypt.cc */
 #ifdef HAVE_CRYPTED_FRM

--- 1.564/sql/sql_parse.cc	2006-08-18 19:16:12 -07:00
+++ 1.565/sql/sql_parse.cc	2006-08-18 19:16:12 -07:00
@@ -5776,27 +5776,6 @@ void mysql_init_multi_delete(LEX *lex)
   lex->query_tables_last= &lex->query_tables;
 }
 
-#ifndef DBUG_OFF
-static void turn_parser_debug_on()
-{
-  /*
-     MYSQLdebug is in sql/sql_yacc.cc, in bison generated code.
-     Turning this option on is **VERY** verbose, and should be
-     used when investigating a syntax error problem only.
-
-     The syntax to run with bison traces is as follows :
-     - Starting a server manually :
-       mysqld --debug="d,parser_debug" ...
-     - Running a test :
-       mysql-test-run.pl --mysqld="--debug=d,parser_debug" ...
-
-     The result will be in the process stderr (var/log/master.err)
-   */
-  extern int MYSQLdebug;
-  MYSQLdebug= 1;
-}
-#endif
-
 /*
   When you modify mysql_parse(), you may need to mofify
   mysql_test_parse_for_slave() in this same file.

--- 1.477/sql/sql_yacc.yy	2006-08-18 19:16:12 -07:00
+++ 1.478/sql/sql_yacc.yy	2006-08-18 19:16:12 -07:00
@@ -68,6 +68,34 @@ inline Item *is_truth_value(Item *A, boo
 	new Item_int((char *) (v1 ? "FALSE" : "TRUE"),!v1, 1));
 }
 
+#ifndef DBUG_OFF
+#define YYDEBUG 1
+#else
+#define YYDEBUG 0
+#endif
+
+#ifndef DBUG_OFF
+void turn_parser_debug_on()
+{
+  /*
+     MYSQLdebug is in sql/sql_yacc.cc, in bison generated code.
+     Turning this option on is **VERY** verbose, and should be
+     used when investigating a syntax error problem only.
+
+     The syntax to run with bison traces is as follows :
+     - Starting a server manually :
+       mysqld --debug="d,parser_debug" ...
+     - Running a test :
+       mysql-test-run.pl --mysqld="--debug=d,parser_debug" ...
+
+     The result will be in the process stderr (var/log/master.err)
+   */
+
+  extern int yydebug;
+  yydebug= 1;
+}
+#endif
+
 %}
 %union {
   int  num;