bk commit into 5.1 tree (msvensson:1.2486)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 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-03-21 14:24:50+01:00, msvensson@stripped +12 -0
  Merge bk-internal:/home/bk/mysql-5.1-new-maint
  into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
  MERGE: 1.2475.1.16

  BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023@stripped, 2007-03-21 14:17:03+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.8.1.1

  BitKeeper/deleted/.del-test_db.sql@stripped, 2007-03-21 14:17:03+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.4.1.1

  BitKeeper/etc/ignore@stripped, 2007-03-21 14:16:57+01:00, msvensson@stripped +0 -2
    auto-union
    MERGE: 1.280.1.1

  include/my_pthread.h@stripped, 2007-03-21 14:17:03+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.109.1.1

  mysql-test/install_test_db.sh@stripped, 2007-03-21 14:24:48+01:00, msvensson@stripped +0 -8
    Manual merge
    MERGE: 1.41.1.1

  mysql-test/mysql-test-run.pl@stripped, 2007-03-21 14:17:03+01:00, msvensson@stripped +0 -11
    Auto merged
    MERGE: 1.283.1.1

  mysql-test/r/flush2.result@stripped, 2007-03-21 14:24:48+01:00, msvensson@stripped +0 -2
    Manual merge
    MERGE: 1.2.1.1

  netware/Makefile.am@stripped, 2007-03-21 14:24:48+01:00, msvensson@stripped +0 -24
    Manual merge
    MERGE: 1.23.1.2

  scripts/make_binary_distribution.sh@stripped, 2007-03-21 14:17:03+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.146.1.1

  sql/log.cc@stripped, 2007-03-21 14:17:03+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.267.2.1

  sql/mysql_priv.h@stripped, 2007-03-21 14:17:03+01:00, msvensson@stripped +0 -3
    Auto merged
    MERGE: 1.483.1.1

  sql/sql_acl.h@stripped, 2007-03-21 14:17:03+01:00, msvensson@stripped +0 -1
    Auto merged
    MERGE: 1.52.1.1

# 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.1-maint/RESYNC

--- 1.269/sql/log.cc	2007-03-21 12:14:03 +01:00
+++ 1.270/sql/log.cc	2007-03-21 14:17:03 +01:00
@@ -68,7 +68,7 @@ char *make_default_log_name(char *buff,c
 {
   strmake(buff, pidfile_name, FN_REFLEN-5);
   return fn_format(buff, buff, mysql_data_home, log_ext,
-                   MYF(MY_UNPACK_FILENAME|MY_APPEND_EXT));
+                   MYF(MY_UNPACK_FILENAME|MY_REPLACE_EXT));
 }
 
 /*

--- 1.24/netware/Makefile.am	2007-03-19 11:14:19 +01:00
+++ 1.25/netware/Makefile.am	2007-03-21 14:24:48 +01:00
@@ -53,11 +53,12 @@ link_sources:
 else
 
 BUILT_SOURCES =                 libmysql.imp init_db.sql test_db.sql
-CLEANFILES =                    $(BUILT_SOURCES)
+DISTCLEANFILES =                libmysql.imp
+CLEANFILES =                    init_db.sql test_db.sql
 
 # Create the libmysql.imp from libmysql/libmysql.def
 libmysql.imp: $(top_srcdir)/libmysql/libmysql.def
-	awk 'BEGIN{x=0;} \
+	$(AWK) 'BEGIN{x=0;} \
              END{printf("\n");} \
              x==1 {printf(" %s",$$1); x++; next} \
              x>1 {printf(",\n %s", $$1); next} \