From 97fc1cc32b49ad835c62cd67a74983dd9aa45214 Mon Sep 17 00:00:00 2001
From: "serg@serg.mysql.com" <>
Date: Tue, 13 Mar 2001 12:54:43 +0100
Subject: [PATCH] sql_lex.cc	per-thread state_map temporarily disabled
 mysql-test-run.sh	PATH corrected

---
 mysql-test/mysql-test-run.sh | 2 +-
 sql/sql_lex.cc               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 1b7d1c26f30..16d26fc48b2 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -18,7 +18,7 @@ TZ=GMT-3; export TZ # for UNIX_TIMESTAMP tests to work
 # Program Definitions
 #--
 
-PATH=/bin:/usr/bin:/usr/local/bin:/usr/bsd
+PATH=/bin:/usr/bin:/usr/local/bin:/usr/bsd:/usr/X11R6/bin
 
 # No paths below as we can't be sure where the program is!
 
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index f0357b99d70..5e75339b0db 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -425,7 +425,7 @@ int yylex(void *arg)
   uint length;
   enum lex_states state,prev_state;
   LEX	*lex=current_lex;
-  uchar *state_map = lex->thd->state_map;
+  uchar *state_map = global_state_map; // thd->lex->state_map;
   YYSTYPE *yylval=(YYSTYPE*) arg;
 
   lex->yylval=yylval;			// The global state