bk commit into 5.1 tree (tnurnberg:1.2282)

[Tatjana A Nuernberg]

Below is the list of changes that have just been committed into a local
5.1 repository of tnurnberg. When tnurnberg 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, 2006-08-24 19:11:51+02:00, tnurnberg@stripped +17
-0
  Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
  into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
  MERGE: 1.2264.1.37

  BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769@stripped, 2006-08-24 19:09:39+02:00,
tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.8.1.1

  client/mysql.cc@stripped, 2006-08-24 19:10:22+02:00,
tnurnberg@stripped +1 -2
    manual merge
    MERGE: 1.222.1.1

  mysql-test/mysql-test-run.pl@stripped, 2006-08-24 19:09:39+02:00,
tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.153.1.3

  mysql-test/r/func_time.result@stripped, 2006-08-24 19:09:39+02:00,
tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.68.1.2

  mysql-test/r/grant.result@stripped, 2006-08-24 19:11:37+02:00,
tnurnberg@stripped +0 -78
    manual merge
    MERGE: 1.56.1.2

  mysql-test/t/disabled.def@stripped, 2006-08-24 19:09:40+02:00,
tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.187.1.1

  mysql-test/t/func_time.test@stripped, 2006-08-24 19:09:40+02:00,
tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.54.1.2

  mysql-test/t/grant.test@stripped, 2006-08-24 19:09:40+02:00,
tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.43.1.1

  mysql-test/t/mysql.test@stripped, 2006-08-24 19:09:40+02:00,
tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.15.1.1

  mysql-test/t/mysql_client_test.test@stripped, 2006-08-24 19:09:40+02:00,
tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.20.1.1

  server-tools/instance-manager/listener.cc@stripped, 2006-08-24 19:09:40+02:00,
tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.26.1.1

  server-tools/instance-manager/portability.h@stripped, 2006-08-24 19:09:40+02:00,
tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.9.1.1

  sql/item_timefunc.cc@stripped, 2006-08-24 19:09:40+02:00,
tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.129.1.2

  sql/mysqld.cc@stripped, 2006-08-24 19:09:40+02:00, tnurnberg@stripped
+0 -0
    Auto merged
    MERGE: 1.574.2.1

  sql/slave.cc@stripped, 2006-08-24 19:09:40+02:00, tnurnberg@stripped
+0 -0
    Auto merged
    MERGE: 1.280.1.2

  sql/sql_acl.cc@stripped, 2006-08-24 19:09:41+02:00, tnurnberg@stripped
+0 -0
    Auto merged
    MERGE: 1.204.1.2

  tests/mysql_client_test.c@stripped, 2006-08-24 19:09:41+02:00,
tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.204.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:	tnurnberg
# Host:	salvation.intern.azundris.com
# Root:	/home/tnurnberg/mysql-5.1-maint/RESYNC

--- 1.155/mysql-test/mysql-test-run.pl	2006-08-24 19:12:15 +02:00
+++ 1.156/mysql-test/mysql-test-run.pl	2006-08-24 19:12:15 +02:00
@@ -1299,8 +1299,8 @@ sub executable_setup () {
     $path_ndb_tools_dir=  "$glob_basedir/bin";
     $exe_ndb_mgm=         "$glob_basedir/bin/ndb_mgm";
     $exe_ndb_waiter=      "$glob_basedir/bin/ndb_waiter";
-    $exe_ndbd=            "$glob_basedir/libexec/ndbd";
-    $exe_ndb_mgmd=        "$glob_basedir/libexec/ndb_mgmd";
+    $exe_ndbd=            "$glob_basedir/bin/ndbd";
+    $exe_ndb_mgmd=        "$glob_basedir/bin/ndb_mgmd";
   }
 
   $exe_master_mysqld= $exe_master_mysqld || $exe_mysqld;

--- 1.188/mysql-test/t/disabled.def	2006-08-24 19:12:15 +02:00
+++ 1.189/mysql-test/t/disabled.def	2006-08-24 19:12:15 +02:00
@@ -45,4 +45,3 @@ rpl_row_basic_7ndb       : BUG#21298 200
 rpl_truncate_7ndb        : BUG#21298 2006-07-27 msvensson
 crash_commit_before      : 2006-08-02 msvensson
 rpl_ndb_dd_advance       : BUG#18679 2006-07-28 jimw (Test fails randomly)
-partition                : BUG#21658 2006-08-17 azundris  fails w/ --ps-protocol

--- 1.57/mysql-test/r/grant.result	2006-08-24 19:12:15 +02:00
+++ 1.58/mysql-test/r/grant.result	2006-08-24 19:12:15 +02:00
@@ -911,7 +911,7 @@ ERROR 42000: SELECT command denied to us
 SHOW CREATE TABLE mysqltest2.t_nn;
 Table	Create Table
 t_nn	CREATE TABLE `t_nn` (
-  `c1` int(11) default NULL
+  `c1` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SHOW CREATE VIEW  mysqltest2.t_nn;
 ERROR HY000: 'mysqltest2.t_nn' is not VIEW
@@ -930,7 +930,7 @@ v_nn	CREATE ALGORITHM=UNDEFINED DEFINER=
 SHOW CREATE TABLE mysqltest2.t_nn;
 Table	Create Table
 t_nn	CREATE TABLE `t_nn` (
-  `c1` int(11) default NULL
+  `c1` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SHOW CREATE VIEW mysqltest2.t_nn;
 ERROR HY000: 'mysqltest2.t_nn' is not VIEW