bk commit into 5.0 tree (msvensson:1.2454)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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@stripped, 2007-02-28 16:39:26+01:00, msvensson@stripped +5 -0
  Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
  into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
  MERGE: 1.1616.2877.69

  BitKeeper/deleted/.del-init_db.sql@stripped, 2007-02-28 16:39:24+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.2.1.1

  BitKeeper/deleted/.del-init_db.sql@stripped, 2007-02-28 16:39:24+01:00, msvensson@stripped +0 -0
    Merge rename: mysql-test/init_db.sql -> BitKeeper/deleted/.del-init_db.sql

  BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8@stripped, 2007-02-28 16:39:24+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.4.1.2

  BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8@stripped, 2007-02-28 16:39:24+01:00, msvensson@stripped +0 -0
    Merge rename: mysql-test/lib/init_db.sql -> BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8

  BitKeeper/etc/ignore@stripped, 2007-02-28 16:39:22+01:00, msvensson@stripped +1 -1
    auto-union
    MERGE: 1.153.1.88

  mysql-test/Makefile.am@stripped, 2007-02-28 16:39:24+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.39.1.21

  sql/mysqld.cc@stripped, 2007-02-28 16:39:24+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.356.98.38

# 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:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.0-maint/RESYNC

--- 1.599/sql/mysqld.cc	2007-02-20 20:22:17 +01:00
+++ 1.600/sql/mysqld.cc	2007-02-28 16:39:24 +01:00
@@ -2037,7 +2037,10 @@ static void check_data_home(const char *
 
 extern "C" sig_handler handle_segfault(int sig)
 {
+  time_t curr_time;
+  struct tm tm;
   THD *thd=current_thd;
+
   /*
     Strictly speaking, one needs a mutex here
     but since we have got SIGSEGV already, things are a mess
@@ -2051,11 +2054,17 @@ extern "C" sig_handler handle_segfault(i
   }
 
   segfaulted = 1;
+
+  curr_time= time(NULL);
+  localtime_r(&curr_time, &tm);
+
   fprintf(stderr,"\
-mysqld got signal %d;\n\
+%02d%02d%02d %2d:%02d:%02d - mysqld got signal %d;\n\
 This could be because you hit a bug. It is also possible that this binary\n\
 or one of the libraries it was linked against is corrupt, improperly built,\n\
 or misconfigured. This error can also be caused by malfunctioning hardware.\n",
+          tm.tm_year % 100, tm.tm_mon+1, tm.tm_mday,
+          tm.tm_hour, tm.tm_min, tm.tm_sec,
 	  sig);
   fprintf(stderr, "\
 We will try our best to scrape up some info that will hopefully help diagnose\n\

--- 1.241/BitKeeper/etc/ignore	2007-02-13 10:00:45 +01:00
+++ 1.242/BitKeeper/etc/ignore	2007-02-28 16:39:22 +01:00
@@ -696,6 +696,7 @@ mysql-test/*.ds?
 mysql-test/*.vcproj
 mysql-test/gmon.out
 mysql-test/install_test_db
+mysql-test/lib/init_db.sql
 mysql-test/mtr
 mysql-test/mysql-test-run
 mysql-test/mysql-test-run-shell

--- 1.85/mysql-test/Makefile.am	2007-02-02 23:05:44 +01:00
+++ 1.86/mysql-test/Makefile.am	2007-02-28 16:39:24 +01:00
@@ -34,7 +34,7 @@ benchdir_root=		$(prefix)
 testdir =	        $(benchdir_root)/mysql-test
 EXTRA_SCRIPTS = 	mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)
 EXTRA_DIST = 		$(EXTRA_SCRIPTS)
-GENSCRIPTS =		mysql-test-run-shell mysql-test-run install_test_db mtr
+GENSCRIPTS =		mysql-test-run-shell mysql-test-run install_test_db mtr lib/init_db.sql
 PRESCRIPTS =		mysql-test-run.pl
 test_SCRIPTS = 		$(GENSCRIPTS) $(PRESCRIPTS)
 test_DATA = 		std_data/client-key.pem \
@@ -124,6 +124,11 @@ mtr:
 mysql-test-run:
 	$(RM) -f mysql-test-run
 	$(LN_S) mysql-test-run.pl mysql-test-run
+
+# Build init_db.sql by executing mysql_create_system_tables
+lib/init_db.sql:
+	$(top_builddir)/scripts/mysql_create_system_tables \
+          test . \@HOSTNAME\@ > lib/init_db.sql
 
 SUFFIXES = .sh