bk commit into 5.0 tree (konstantin:1.2217)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja 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.2217 06/07/01 00:14:28 konstantin@stripped +3 -0
  Remove a couple of unused/barely used names.

  sql/sql_parse.cc
    1.557 06/07/01 00:14:24 konstantin@stripped +3 -3
    Remove an unused thread key, current_lex macro.

  sql/sql_lex.h
    1.221 06/07/01 00:14:24 konstantin@stripped +0 -3
    Remove an unused thread key, current_lex.

  sql/sql_lex.cc
    1.190 06/07/01 00:14:24 konstantin@stripped +0 -4
    Remove an unused thread key.

# 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:	konstantin
# Host:	bodhi.netgear
# Root:	/opt/local/work/mysql-5.0-runtime-experiment

--- 1.189/sql/sql_lex.cc	2006-06-27 21:28:25 +04:00
+++ 1.190/sql/sql_lex.cc	2006-07-01 00:14:24 +04:00
@@ -41,8 +41,6 @@
 #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
 
@@ -90,8 +88,6 @@
     symbols[i].length=(uchar) strlen(symbols[i].name);
   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;
 }

--- 1.220/sql/sql_lex.h	2006-06-27 21:28:25 +04:00
+++ 1.221/sql/sql_lex.h	2006-07-01 00:14:24 +04:00
@@ -1116,6 +1116,3 @@
 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)

--- 1.556/sql/sql_parse.cc	2006-06-28 13:23:24 +04:00
+++ 1.557/sql/sql_parse.cc	2006-07-01 00:14:24 +04:00
@@ -2365,7 +2365,7 @@
 
 
 /*
-  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 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 @@
 
 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