diff options
| author | unknown <serg@serg.mysql.com> | 2001-03-13 12:54:43 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-03-13 12:54:43 +0100 |
| commit | 99f49c3c966ecaff273ec40223128c9211faa193 (patch) | |
| tree | 63172fe2bbdfdfbe3b6f765455912c82334f031a | |
| parent | f9df810cc6484d77aba512fe983fef7b1529f2ef (diff) | |
| download | mariadb-git-99f49c3c966ecaff273ec40223128c9211faa193.tar.gz | |
sql_lex.cc per-thread state_map temporarily disabled
mysql-test-run.sh PATH corrected
mysql-test/mysql-test-run.sh:
PATH corrected
sql/sql_lex.cc:
per-thread state_map temporarily disabled
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 2 | ||||
| -rw-r--r-- | 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 |