bk commit into 5.0 tree (bldsql:1.1987)

[kvishwanatha]

Below is the list of changes that have just been committed into a local
5.0 repository of bldsql. When bldsql 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.1987 05/12/14 17:08:23 bldsql@stripped +2 -0
  Use the local file.

  sql/tztime.cc
    1.30 05/12/14 17:08:19 bldsql@stripped +0 -5
    Use the local file.

  netware/mysql_test_run.c
    1.19 05/12/14 16:44:05 bldsql@stripped +0 -0
    Auto merged

# 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:	bldsql
# Host:	blr-naas-nwl03.blr.novell.com
# Root:	/home/bldsql/bk/mysql-5.0-mainbk/RESYNC

--- 1.18/netware/mysql_test_run.c	2005-11-22 12:13:53 +05:30
+++ 1.19/netware/mysql_test_run.c	2005-12-14 16:44:05 +05:30
@@ -349,6 +349,8 @@
   add_arg(&al, "--tmpdir=%s", mysql_tmp_dir);
   add_arg(&al, "--language=%s", lang_dir);
   add_arg(&al, "--log-bin-trust-routine-creators");
+  add_arg(&al, "--log-slow-queries");
+  add_arg(&al, "--log-queries-not-using-indexes");
 #ifdef DEBUG	//only for debug builds
   add_arg(&al, "--debug");
 #endif
@@ -523,6 +525,8 @@
   add_arg(&al, "-O");
   add_arg(&al, "slave_net_timeout=10");
   add_arg(&al, "--log-bin-trust-routine-creators");
+  add_arg(&al, "--log-slow-queries");
+  add_arg(&al, "--log-queries-not-using-indexes");
 #ifdef DEBUG	//only for debug builds
   add_arg(&al, "--debug");
 #endif