THD::lex now points to THD::main_lex like in 5.0

All tests pass (client_test included)


libmysqld/lib_sql.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/filesort.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/ha_innodb.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/ha_myisam.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/item.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/item_cmpfunc.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/item_create.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/item_func.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/item_subselect.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/item_sum.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/mysql_priv.h:
  THD::lex now points to THD::main_lex like in 5.0
sql/mysqld.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/protocol.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/repl_failsafe.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/slave.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/sql_acl.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/sql_base.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/sql_cache.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/sql_class.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/sql_class.h:
  THD::lex now points to THD::main_lex like in 5.0
sql/sql_delete.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/sql_error.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/sql_insert.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/sql_lex.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/sql_lex.h:
  THD::lex now points to THD::main_lex like in 5.0
sql/sql_parse.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/sql_prepare.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/sql_repl.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/sql_select.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/sql_table.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/sql_union.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/sql_update.cc:
  THD::lex now points to THD::main_lex like in 5.0
sql/sql_yacc.yy:
  THD::lex now points to THD::main_lex like in 5.0

1 files changed, 7 insertions, 7 deletions

diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index 71dd7123d98..c63b1a9e026 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -289,7 +289,7 @@ TODO list:
 
       if (thd->temp_tables || global_merge_table_count)
 
-    - Another option would be to set thd->lex.safe_to_cache_query to 0
+    - Another option would be to set thd->lex->safe_to_cache_query to 0
       in 'get_lock_data' if any of the tables was a tmp table or a
       MRG_ISAM table.
       (This could be done with almost no speed penalty)
@@ -761,7 +761,7 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used)
   uint8 tables_type= 0;
 
   if ((local_tables= is_cacheable(thd, thd->query_length,
-				  thd->query, &thd->lex, tables_used,
+				  thd->query, thd->lex, tables_used,
 				  &tables_type)))
   {
     NET *net= &thd->net;
@@ -913,7 +913,7 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
   /* Check that we haven't forgot to reset the query cache variables */
   DBUG_ASSERT(thd->net.query_cache_query == 0);
 
-  if (!thd->lex.safe_to_cache_query)
+  if (!thd->lex->safe_to_cache_query)
   {
     DBUG_PRINT("qcache", ("SELECT is non-cacheable"));
     goto err;
@@ -1018,7 +1018,7 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
 		  table_list.db, table_list.alias));
       refused++;				// This is actually a hit
       STRUCT_UNLOCK(&structure_guard_mutex);
-      thd->lex.safe_to_cache_query=0;		// Don't try to cache this
+      thd->lex->safe_to_cache_query=0;		// Don't try to cache this
       BLOCK_UNLOCK_RD(query_block);
       DBUG_RETURN(-1);				// Privilege error
     }
@@ -1027,7 +1027,7 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
       DBUG_PRINT("qcache", ("Need to check column privileges for %s.%s",
 			    table_list.db, table_list.alias));
       BLOCK_UNLOCK_RD(query_block);
-      thd->lex.safe_to_cache_query= 0;		// Don't try to cache this
+      thd->lex->safe_to_cache_query= 0;		// Don't try to cache this
       goto err_unlock;				// Parse query
     }
 #endif /*!NO_EMBEDDED_ACCESS_CHECKS*/
@@ -1038,7 +1038,7 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
       DBUG_PRINT("qcache", ("Handler does not allow caching for %s.%s",
 			    table_list.db, table_list.alias));
       BLOCK_UNLOCK_RD(query_block);
-      thd->lex.safe_to_cache_query= 0;          // Don't try to cache this
+      thd->lex->safe_to_cache_query= 0;          // Don't try to cache this
       goto err_unlock;				// Parse query
     }
     else
@@ -2615,7 +2615,7 @@ my_bool Query_cache::ask_handler_allowance(THD *thd,
     {
       DBUG_PRINT("qcache", ("Handler does not allow caching for %s.%s",
 			    tables_used->db, tables_used->alias));
-      thd->lex.safe_to_cache_query= 0;          // Don't try to cache this
+      thd->lex->safe_to_cache_query= 0;          // Don't try to cache this
       DBUG_RETURN(1);
     }
   }