bk commit into 5.1 tree (stewart:1.1984)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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.1984 05/06/28 17:28:20 stewart@stripped +1 -0
  WL#2325 NDB Binlog Injector thread
  
  Fix valgrind warning in begin_trans in sql_parse.cc with injector thread.

  sql/sql_parse.cc
    1.452 05/06/28 17:28:11 stewart@stripped +1 -1
    Fix valgrind warning when running NDB binlog injector.
    
    It's because we don't actually use the lex structure in the injector thread,
    so although the skeleton of it is there, the rest of it isn't initialised.
    
    Warning was:
    
    ==25924== Thread 15:
    ==25924== Conditional jump or move depends on uninitialised value(s)
    ==25924==    at 0x10183568: begin_trans(THD*) (sql_parse.cc:178)
    ==25924==    by 0x1023E494: injector::new_trans(THD*) (rpl_injector.cc:39)
    ==25924==    by 0x102743B8: ndb_binlog_thread_func (ha_ndbcluster.cc:9469)
    ==25924==    by 0xFD35E3C: pthread_start_thread (in /lib/libpthread-0.10.so)
    ==25924==    by 0xFA90570: clone (in /lib/libc-2.3.2.so)

# 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:	stewart
# Host:	kennedy.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/mysql-5.1-wl2325

--- 1.451/sql/sql_parse.cc	2005-06-23 18:58:55 +10:00
+++ 1.452/sql/sql_parse.cc	2005-06-28 17:28:11 +10:00
@@ -169,7 +169,7 @@
   }
   if (end_active_trans(thd))
     error= -1;
-  else
+  else if(thd->query) // lex only valid if we have a query
   {
     LEX *lex= thd->lex;
     thd->options= ((thd->options & (ulong) ~(OPTION_STATUS_NO_TRANS_UPDATE)) |