From 41fea3d763a26f799f110bd6ede3dba9a7f53f04 Mon Sep 17 00:00:00 2001
From: "konstantin@mysql.com" <>
Date: Sat, 1 Jul 2006 00:14:28 +0400
Subject: [PATCH] Remove a couple of unused/barely used names.

---
 sql/sql_lex.cc   | 4 ----
 sql/sql_lex.h    | 3 ---
 sql/sql_parse.cc | 6 +++---
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 47af816f41d..7d4dca15608 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -41,8 +41,6 @@ sys_var_long_ptr trg_new_row_fake_var(0, 0);
 #define yySkip()	lex->ptr++
 #define yyLength()	((uint) (lex->ptr - lex->tok_start)-1)
 
-pthread_key(LEX*,THR_LEX);
-
 /* Longest standard keyword name */
 #define TOCK_NAME_LENGTH 24
 
@@ -91,8 +89,6 @@ void lex_init(void)
   for (i=0 ; i < array_elements(sql_functions) ; i++)
     sql_functions[i].length=(uchar) strlen(sql_functions[i].name);
 
-  VOID(pthread_key_create(&THR_LEX,NULL));
-
   DBUG_VOID_RETURN;
 }
 
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 285e1d6d5a6..356c64526fa 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -1116,6 +1116,3 @@ extern void lex_start(THD *thd, uchar *buf,uint length);
 extern void lex_end(LEX *lex);
 extern int MYSQLlex(void *arg, void *yythd);
 
-extern pthread_key(LEX*,THR_LEX);
-
-#define current_lex (current_thd->lex)
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index cd57c280950..0e21b848125 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2365,7 +2365,7 @@ static void reset_one_shot_variables(THD *thd)
 
 
 /*
-  Execute command saved in thd and current_lex->sql_command
+  Execute command saved in thd and lex->sql_command
 
   SYNOPSIS
     mysql_execute_command()
@@ -5541,7 +5541,7 @@ bool check_stack_overrun(THD *thd, long margin,
 
 bool my_yyoverflow(short **yyss, YYSTYPE **yyvs, ulong *yystacksize)
 {
-  LEX	*lex=current_lex;
+  LEX	*lex= current_thd->lex;
   ulong old_info=0;
   if ((uint) *yystacksize >= MY_YACC_MAX)
     return 1;
@@ -5978,7 +5978,7 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type,
 
 void store_position_for_column(const char *name)
 {
-  current_lex->last_field->after=my_const_cast(char*) (name);
+  current_thd->lex->last_field->after=my_const_cast(char*) (name);
 }
 
 bool