bk commit into 5.1 tree (jani:1.2180)

[jani]

Below is the list of changes that have just been committed into a local
5.1 repository of jani. When jani 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.2180 06/06/01 16:26:16 jani@stripped +1 -0
  In prepare_view_securety_context() the sql_command came in wrong.
  If the first part was SHOW and second part SELECT, it would have
  thought that the command was SELECT, although the first part of
  it was SHOW. It would then fail later.
  
  Thus we need to set thd->lex to old_lex (first part) here before going
  in to prepare_security().

  sql/sql_view.cc
    1.93 06/06/01 16:26:09 jani@stripped +3 -1
    In prepare_view_securety_context() the sql_command came in wrong.
    If the first part was SHOW and second part SELECT, it would have
    thought that the command was SELECT, although the first part of
    it was SHOW. It would then fail later.
    
    Thus we need to set thd->lex to old_lex (first part) here before going
    in to prepare_security().

# 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:	jani
# Host:	ua141d10.elisa.omakaista.fi
# Root:	/home/my/bk/mysql-5.1-new-marvel

--- 1.92/sql/sql_view.cc	2006-05-05 13:10:38 +03:00
+++ 1.93/sql/sql_view.cc	2006-06-01 16:26:09 +03:00
@@ -1191,9 +1191,11 @@
 ok2:
   if (!old_lex->time_zone_tables_used && thd->lex->time_zone_tables_used)
     old_lex->time_zone_tables_used= thd->lex->time_zone_tables_used;
+  DBUG_ASSERT(lex == thd->lex);
+  thd->lex= old_lex;                            // Needed for prepare_security
   result= !table->prelocking_placeholder && table->prepare_security(thd);
 
-  lex_end(thd->lex);
+  lex_end(lex);
 end:
   if (arena)
     thd->restore_active_arena(arena, &backup);