Merge mysql.com:/home/jonas/src/new-fix

into mysql.com:/home/jonas/src/mysql-4.1

.bzrignore

@@ -922,3 +922,4 @@ Docs/Images/mydsn-test-success.txt
 Docs/Images/mydsn-trace.txt
 Docs/Images/mydsn.txt
 Docs/Images/myflowchart.txt
+mysql-test/mysql_test_run_new

BitKeeper/etc/logging_ok

@@ -95,6 +95,7 @@ kaj@work.mysql.com
 kent@mysql.com
 konstantin@mysql.com
 kostja@oak.local
+lars@mysql.com
 lenz@kallisto.mysql.com
 lenz@mysql.com
 magnus@neptunus.(none)

Docs/Images/Makefile.am

+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this library; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+# MA 02111-1307, USA
+
+## Process this file with automake to create Makefile.in
+
+# This is a dummy file to satisfy the hierarchy of Makefiles.
+# When a release is built, the true Makefile will be copied 
+# together with the "real" files in this directory.
+
+EXTRA_DIST =		
+
+# Nothing to create in this dummy directory.
+all:
+	:
+
+# Nothing to cleanup in this dummy directory.
+clean:
+	:
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

acinclude.m4

@@ -208,7 +208,7 @@ INCLUDES="$INCLUDES $ZLIB_INCLUDES"
 LIBS="$LIBS $ZLIB_LIBS"
 AC_CACHE_VAL([mysql_cv_compress],
   [AC_TRY_LINK([#include <zlib.h>],
-    [int link_test() { return compress(0, (unsigned long*) 0, "", 0); }],
+    [return compress(0, (unsigned long*) 0, "", 0);],
     [mysql_cv_compress="yes"
     AC_MSG_RESULT([ok])],
     [mysql_cv_compress="no"])

client/mysqladmin.c

@@ -108,7 +108,7 @@ static const char *command_names[]= {
 };
 
 static TYPELIB command_typelib=
-{ array_elements(command_names)-1,"commands", command_names};
+{ array_elements(command_names)-1,"commands", command_names, NULL};
 
 static struct my_option my_long_options[] =
 {

client/mysqldump.c

@@ -124,7 +124,7 @@ const char *compatible_mode_names[]=
  (1<<10)   /* ANSI       */\
 )
 TYPELIB compatible_mode_typelib= {array_elements(compatible_mode_names) - 1,
-				  "", compatible_mode_names};
+				  "", compatible_mode_names, NULL};
 
 
 static struct my_option my_long_options[] =
@@ -317,7 +317,7 @@ static struct my_option my_long_options[] =
   {"comments", 'i', "Write additional information.",
    (gptr*) &opt_comments, (gptr*) &opt_comments, 0, GET_BOOL, NO_ARG,
    1, 0, 0, 0, 0, 0},
-  {"hex-blob", OPT_HEXBLOB, "Dump BLOBs in HEX. this mode does not work with extended-insert",
+  {"hex-blob", OPT_HEXBLOB, "Dump BLOBs in HEX.",
    (gptr*) &opt_hex_blob, (gptr*) &opt_hex_blob, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
@@ -1523,10 +1523,12 @@ static void dumpTable(uint numFields, char *table)
 	/*
 	   63 is my_charset_bin. If charsetnr is not 63,
 	   we have not a BLOB but a TEXT column. 
-	   we'll dump it in hex only BLOB columns.
+	   we'll dump in hex only BLOB columns.
 	*/
         is_blob= (opt_hex_blob && field->charsetnr == 63 &&
-                  (field->type == FIELD_TYPE_BLOB ||
+                  (field->type == FIELD_TYPE_STRING ||
+                   field->type == FIELD_TYPE_VAR_STRING ||
+                   field->type == FIELD_TYPE_BLOB ||
                    field->type == FIELD_TYPE_LONG_BLOB ||
                    field->type == FIELD_TYPE_MEDIUM_BLOB ||
                    field->type == FIELD_TYPE_TINY_BLOB)) ? 1 : 0;
@@ -1544,6 +1546,13 @@ static void dumpTable(uint numFields, char *table)
 	    {
 	      if (!IS_NUM_FIELD(field))
 	      {
+	        /*
+	          "length * 2 + 2" is OK for both HEX and non-HEX modes:
+	          - In HEX mode we need exactly 2 bytes per character
+	          plus 2 bytes for '0x' prefix.
+	          - In non-HEX mode we need up to 2 bytes per character,
+	          plus 2 bytes for leading and trailing '\'' characters.
+	        */
 		if (dynstr_realloc(&extended_row,length * 2+2))
 		{
 		  fputs("Aborting dump (out of memory)",stderr);
@@ -1552,15 +1561,11 @@ static void dumpTable(uint numFields, char *table)
 		}
                 if (opt_hex_blob && is_blob)
                 {
-                  ulong counter;
-                  unsigned char *ptr= row[i];
                   dynstr_append(&extended_row, "0x");
-                  for (counter = 0; counter < lengths[i]; counter++)
-                  {
-                    char xx[3];
-                    sprintf(xx, "%02X", ptr[counter]);
-                    dynstr_append(&extended_row, xx);
-                  }
+                  extended_row.length+= mysql_hex_string(extended_row.str + 
+                                                         extended_row.length,
+                                                         row[i], length);
+                  extended_row.str[extended_row.length]= '\0';
                 }
                 else
                 {

client/mysqltest.c

@@ -949,8 +949,11 @@ static void do_exec(struct st_query* q)
     while (fgets(buf, sizeof(buf), res_file))
       replace_dynstr_append_mem(ds, buf, strlen(buf));
   }
-
+#ifndef __WIN__
   error= pclose(res_file);
+#else  
+  error= _pclose(res_file);
+#endif  
 
   if (error != 0)
     die("command \"%s\" failed", cmd);
@@ -4516,8 +4519,7 @@ static void get_replace_column(struct st_query *q)
   my_free(start, MYF(0));
 }
 
-#ifdef __NETWARE__
-
+#if defined(__NETWARE__) || defined(__WIN__)
 /*
   Substitute environment variables with text.
 
@@ -4608,9 +4610,13 @@ FILE *my_popen(const char *cmd, const char *mode __attribute__((unused)))
   FILE *res_file;
 
   subst_cmd= subst_env_var(cmd);
+#ifndef __WIN__
   res_file= popen(subst_cmd, "r0");
+#else
+  res_file= _popen(subst_cmd, "r0");
+#endif
   my_free(subst_cmd, MYF(0));
   return res_file;
 }
 
-#endif /* __NETWARE__ */
+#endif /* __NETWARE__ or  __WIN__*/

innobase/ibuf/ibuf0ibuf.c

@@ -2866,6 +2866,8 @@ ibuf_delete_rec(
 
 #ifdef UNIV_IBUF_DEBUG
 	ibuf_count_set(space, page_no, ibuf_count_get(space, page_no) - 1);
+#else
+	UT_NOT_USED(space);
 #endif
 	ibuf_data_sizes_update(ibuf_data, root, mtr);
 
@@ -3267,11 +3269,11 @@ ibuf_delete_for_discarded_space(
 	ibuf_data->n_merged_recs += n_inserts;
 
 	mutex_exit(&ibuf_mutex);
-
+	/*
 	fprintf(stderr,
 		"InnoDB: Discarded %lu ibuf entries for space %lu\n",
 		(ulong) n_inserts, (ulong) space);
-
+	*/
 	ibuf_exit();
 
 	mem_heap_free(heap);

innobase/include/lock0lock.h

@@ -463,6 +463,14 @@ lock_rec_hash(
 	ulint	space,	/* in: space */
 	ulint	page_no);/* in: page number */
 /*************************************************************************
+Gets the table covered by an IX table lock. */
+
+dict_table_t*
+lock_get_ix_table(
+/*==============*/
+			/* out: the table covered by the lock */
+	lock_t*	lock);	/* in: table lock */
+/*************************************************************************
 Checks that a transaction id is sensible, i.e., not in the future. */
 
 ibool

innobase/include/row0mysql.h

@@ -175,8 +175,12 @@ int
 row_lock_table_for_mysql(
 /*=====================*/
 					/* out: error code or DB_SUCCESS */
-	row_prebuilt_t*	prebuilt);	/* in: prebuilt struct in the MySQL
+	row_prebuilt_t*	prebuilt,	/* in: prebuilt struct in the MySQL
 					table handle */
+	dict_table_t*	table);		/* in: table to LOCK_IX, or NULL
+					if prebuilt->table should be
+					locked as LOCK_TABLE_EXP |
+					prebuilt->select_lock_type */
 /*************************************************************************
 Does an insert for MySQL. */
 

innobase/lock/lock0lock.c

@@ -395,6 +395,19 @@ lock_rec_get_nth_bit(
 	return(ut_bit_get_nth(b, bit_index));
 }	
 
+/*************************************************************************
+Gets the table covered by an IX table lock. */
+
+dict_table_t*
+lock_get_ix_table(
+/*==============*/
+			/* out: the table covered by the lock */
+	lock_t*	lock)	/* in: table lock */
+{
+	ut_a(lock->type_mode == (LOCK_TABLE | LOCK_IX));
+	return(lock->un_member.tab_lock.table);
+}
+
 /*************************************************************************/
 
 #define lock_mutex_enter_kernel()	mutex_enter(&kernel_mutex)

innobase/row/row0mysql.c

@@ -779,8 +779,12 @@ int
 row_lock_table_for_mysql(
 /*=====================*/
 					/* out: error code or DB_SUCCESS */
-	row_prebuilt_t*	prebuilt)	/* in: prebuilt struct in the MySQL
+	row_prebuilt_t*	prebuilt,	/* in: prebuilt struct in the MySQL
 					table handle */
+	dict_table_t*	table)		/* in: table to LOCK_IX, or NULL
+					if prebuilt->table should be
+					locked as LOCK_TABLE_EXP |
+					prebuilt->select_lock_type */
 {
 	trx_t*		trx 		= prebuilt->trx;
 	que_thr_t*	thr;
@@ -813,8 +817,12 @@ row_lock_table_for_mysql(
 
 	trx_start_if_not_started(trx);
 
-	err = lock_table(LOCK_TABLE_EXP, prebuilt->table,
-		prebuilt->select_lock_type, thr);
+	if (table) {
+		err = lock_table(0, table, LOCK_IX, thr);
+	} else {
+		err = lock_table(LOCK_TABLE_EXP, prebuilt->table,
+			prebuilt->select_lock_type, thr);
+	}
 
 	trx->error_state = err;
 

libmysql/libmysql.c

@@ -1563,7 +1563,8 @@ void my_net_local_init(NET *net)
   trailing '. The caller must supply whichever of those is desired.
 */
 
-ulong mysql_hex_string(char *to, const char *from, ulong length)
+ulong STDCALL
+mysql_hex_string(char *to, const char *from, ulong length)
 {
   char *to0= to;
   const char *end;

libmysql/libmysql.def

@@ -47,6 +47,7 @@ EXPORTS
 	mysql_errno
 	mysql_error
 	mysql_escape_string
+	mysql_hex_string
 	mysql_stmt_execute
 	mysql_stmt_fetch
 	mysql_stmt_fetch_column

mysql-test/Makefile.am

@@ -36,6 +36,12 @@ test_SCRIPTS = 		mysql-test-run install_test_db
 test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem
 CLEANFILES = 		$(test_SCRIPTS) $(test_DATA)
 
+INCLUDES =			-I$(srcdir)/../include -I../include -I..
+bin_PROGRAMS =		mysql_test_run_new
+noinst_HEADERS =	my_manage.h
+mysql_test_run_new_SOURCES=		mysql_test_run_new.c my_manage.c
+
+
 dist-hook:
 	mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \
 		$(distdir)/std_data

mysql-test/init_db.sql

+CREATE DATABASE mysql;
+CREATE DATABASE test;
+
+USE mysql;
+
+CREATE TABLE db (Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Select_priv enum('N','Y') DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') DEFAULT 'N' NOT NULL, References_priv enum('N','Y') DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL, PRIMARY KEY Host (Host,Db,User), KEY User (User)) comment='Database privileges';
+
+INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');
+INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');
+ 
+CREATE TABLE host (Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, Select_priv enum('N','Y') DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') DEFAULT 'N' NOT NULL, References_priv enum('N','Y') DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL, PRIMARY KEY Host (Host,Db)) comment='Host privileges; Merged with database privileges';
+
+CREATE TABLE user (Host char(60) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Password char(45) binary DEFAULT '' NOT NULL, Select_priv enum('N','Y') DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL, Reload_priv enum('N','Y') DEFAULT 'N' NOT NULL, Shutdown_priv enum('N','Y') DEFAULT 'N' NOT NULL, Process_priv enum('N','Y') DEFAULT 'N' NOT NULL, File_priv enum('N','Y') DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') DEFAULT 'N' NOT NULL, References_priv enum('N','Y') DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL, Show_db_priv enum('N','Y') DEFAULT 'N' NOT NULL, Super_priv enum('N','Y') DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL, Execute_priv enum('N','Y') DEFAULT 'N' NOT NULL, Repl_slave_priv enum('N','Y') DEFAULT 'N' NOT NULL, Repl_client_priv enum('N','Y') DEFAULT 'N' NOT NULL, ssl_type enum('','ANY','X509', 'SPECIFIED') DEFAULT '' NOT NULL, ssl_cipher BLOB NOT NULL, x509_issuer BLOB NOT NULL, x509_subject BLOB NOT NULL, max_questions int(11) unsigned DEFAULT 0 NOT NULL, max_updates int(11) unsigned DEFAULT 0 NOT NULL, max_connections int(11) unsigned DEFAULT 0 NOT NULL, PRIMARY KEY Host (Host,User)) comment='Users and global privileges';
+
+INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
+INSERT INTO user VALUES ('','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
+
+INSERT INTO user (host,user) values ('localhost','');
+INSERT INTO user (host,user) values ('','');
+
+CREATE TABLE func (name char(64) binary DEFAULT '' NOT NULL, ret tinyint(1) DEFAULT '0' NOT NULL, dl char(128) DEFAULT '' NOT NULL, type enum ('function','aggregate') NOT NULL, PRIMARY KEY (name)) comment='User defined functions';
+
+CREATE TABLE tables_priv (Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(60) binary DEFAULT '' NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Timestamp timestamp(14), Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') DEFAULT '' NOT NULL, Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name), KEY Grantor (Grantor)) comment='Table privileges';
+
+CREATE TABLE columns_priv (Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Column_name char(64) binary DEFAULT '' NOT NULL, Timestamp timestamp(14), Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name,Column_name)) comment='Column privileges';
+

mysql-test/my_manage.h

+/*
+  Copyright (c) 2002 Novell, Inc. All Rights Reserved. 
+
+  This program is free software; you can redistribute it and/or modify 
+  it under the terms of the GNU General Public License as published by 
+  the Free Software Foundation; either version 2 of the License, or 
+  (at your option) any later version. 
+
+  This program is distributed in the hope that it will be useful, 
+  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+  GNU General Public License for more details. 
+
+  You should have received a copy of the GNU General Public License 
+  along with this program; if not, write to the Free Software 
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/ 
+
+#ifndef _MY_MANAGE
+#define _MY_MANAGE
+
+/******************************************************************************
+
+        includes
+        
+******************************************************************************/
+
+#include <stdlib.h>
+#ifndef __WIN__
+#include <unistd.h>
+#endif
+#ifndef __NETWARE__
+#include <string.h>
+#include <my_global.h>
+#include <m_string.h>
+
+#ifndef __WIN__
+#define strnicmp strncasecmp
+#define strlwr(STRARG) (STRARG)
+#else
+int my_vsnprintf_(char *to, size_t n, const char* value, ...);
+#endif
+#endif
+
+/******************************************************************************
+
+        macros
+        
+******************************************************************************/
+
+#define ARG_BUF                 10
+#define TRY_MAX                 5
+
+#ifdef __WIN__
+#define PATH_MAX _MAX_PATH
+#define NAME_MAX _MAX_FNAME
+#define kill(A,B) TerminateProcess((HANDLE)A,0)
+#define NOT_NEED_PID 0
+#define MASTER_PID   1
+#define SLAVE_PID    2
+#define mysqld_timeout 60000
+
+int pid_mode;
+bool run_server;
+bool skip_first_param;
+
+#define snprintf _snprintf
+#define vsnprintf _vsnprintf
+#endif
+
+
+/******************************************************************************
+
+        structures
+        
+******************************************************************************/
+
+typedef struct
+{
+  
+  int argc;
+  char **argv;
+
+  size_t size;
+
+} arg_list_t;
+
+#ifdef __WIN__
+typedef int pid_t;
+#endif
+/******************************************************************************
+
+        global variables
+        
+******************************************************************************/
+
+/******************************************************************************
+
+        prototypes
+        
+******************************************************************************/
+
+void init_args(arg_list_t *);
+void add_arg(arg_list_t *, const char *, ...);
+void free_args(arg_list_t *);
+
+#ifndef __WIN__
+int sleep_until_file_exists(char *);
+int sleep_until_file_deleted(char *);
+#else
+int sleep_until_file_exists(HANDLE);
+int sleep_until_file_deleted(HANDLE);
+#endif
+int wait_for_server_start(char *, char *, char *, char *, int,char *);
+
+#ifndef __WIN__
+int spawn(char *, arg_list_t *, int, char *, char *, char *, char *);
+#else
+int spawn(char *, arg_list_t *, int , char *, char *, char *, HANDLE *);
+#endif
+
+#ifndef __WIN__
+int stop_server(char *, char *, char *, char *, int, char *,char *);
+pid_t get_server_pid(char *);
+void kill_server(pid_t pid);
+#else
+int stop_server(char *, char *, char *, char *, int, HANDLE,char *);
+#endif
+void del_tree(char *);
+int removef(const char *, ...);
+
+void get_basedir(char *, char *);
+void remove_empty_file(const char *file_name);
+
+#endif /* _MY_MANAGE */

mysql-test/mysql-test-run.sh

@@ -994,9 +994,11 @@ start_master()
   if [ -n "$1" ] ; then
    id=`$EXPR $1 + 101`;
    this_master_myport=`$EXPR $MASTER_MYPORT + $1`
+   NOT_FIRST_MASTER_EXTRA_OPTS="--skip-innodb"
   else
    id=1;
    this_master_myport=$MASTER_MYPORT
+   NOT_FIRST_MASTER_EXTRA_OPTS=""
   fi
   if [ -z "$DO_BENCH" ]
   then
@@ -1020,7 +1022,8 @@ start_master()
 	  --open-files-limit=1024 \
 	   $MASTER_40_ARGS \
            $SMALL_SERVER \
-           $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT"
+           $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT \
+           $NOT_FIRST_MASTER_EXTRA_OPTS"
   else
     master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin$1 \
           --server-id=$id --rpl-recovery-rank=1 \
@@ -1039,7 +1042,8 @@ start_master()
           --innodb_data_file_path=ibdata1:50M \
 	   $MASTER_40_ARGS \
            $SMALL_SERVER \
-           $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT"
+           $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT \
+           $NOT_FIRST_MASTER_EXTRA_OPTS"
   fi
 
   CUR_MYERR=$MASTER_MYERR

mysql-test/ndb/ndbcluster.sh

@@ -102,12 +102,43 @@ if [ ! -x "$exec_mgmtsrvr" ]; then
   echo "$exec_mgmtsrvr missing"
   exit 1
 fi
+if [ ! -x "$exec_waiter" ]; then
+  echo "$exec_waiter missing"
+  exit 1
+fi
+
+exec_mgmtclient="$exec_mgmtclient --no-defaults"
+exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults"
+exec_ndb="$exec_ndb --no-defaults"
+exec_waiter="$exec_waiter --no-defaults"
 
 ndb_host="localhost"
 ndb_mgmd_port=$port_base
 NDB_CONNECTSTRING="host=$ndb_host:$ndb_mgmd_port"
 export NDB_CONNECTSTRING
 
+sleep_until_file_created () {
+  file=$1
+  loop=$2
+  org_time=$2
+  message=$3
+  while (test $loop -gt 0)
+  do
+    if [ -r $file ]
+    then
+      return 0
+    fi
+    sleep 1
+    loop=`expr $loop - 1`
+  done
+  if [ $message ]
+  then
+    echo $message
+  fi
+  echo "ERROR: $file was not created in $org_time seconds;  Aborting"
+  return 1;
+}
+
 start_default_ndbcluster() {
 
 # do some checks
@@ -127,8 +158,8 @@ port_transporter=`expr $ndb_mgmd_port + 2`
 # Start management server as deamon
 
 # Edit file system path and ports in config file
-
 if [ $initial_ndb ] ; then
+  rm -f $fs_ndb/ndb_*
 sed \
     -e s,"CHOOSE_MaxNoOfOrderedIndexes","$ndb_no_ord",g \
     -e s,"CHOOSE_MaxNoOfConcurrentOperations","$ndb_con_op",g \
@@ -146,25 +177,36 @@ fi
 rm -f "$cfgfile" 2>&1 | cat > /dev/null
 rm -f "$fs_ndb/$cfgfile" 2>&1 | cat > /dev/null
 
-if ( cd "$fs_ndb" ; $exec_mgmtsrvr -c config.ini ) ; then :; else
+if ( cd "$fs_ndb" ; $exec_mgmtsrvr -f config.ini ) ; then :; else
   echo "Unable to start $exec_mgmtsrvr from `pwd`"
   exit 1
 fi
-
+if sleep_until_file_created $fs_ndb/ndb_3.pid 30
+then :; else
+  exit 1
+fi
 cat `find "$fs_ndb" -name 'ndb_*.pid'` > "$fs_ndb/$pidfile"
 
 # Start database node 
 
 echo "Starting ndbd"
 ( cd "$fs_ndb" ; $exec_ndb $flags_ndb & )
-
+if sleep_until_file_created $fs_ndb/ndb_1.pid 30
+then :; else
+  stop_default_ndbcluster
+  exit 1
+fi
 cat `find "$fs_ndb" -name 'ndb_*.pid'` > "$fs_ndb/$pidfile"
 
 # Start database node 
 
 echo "Starting ndbd"
 ( cd "$fs_ndb" ; $exec_ndb $flags_ndb & )
-
+if sleep_until_file_created $fs_ndb/ndb_2.pid 30
+then :; else
+  stop_default_ndbcluster
+  exit 1
+fi
 cat `find "$fs_ndb" -name 'ndb_*.pid'` > "$fs_ndb/$pidfile"
 
 # test if Ndb Cluster starts properly
@@ -172,6 +214,7 @@ cat `find "$fs_ndb" -name 'ndb_*.pid'` > "$fs_ndb/$pidfile"
 echo "Waiting for started..."
 if ( $exec_waiter ) | grep "NDBT_ProgramExit: 0 - OK"; then :; else
   echo "Ndbcluster startup failed"
+  stop_default_ndbcluster
   exit 1
 fi
 
@@ -198,10 +241,12 @@ if [ -f "$fs_ndb/$pidfile" ] ; then
   attempt=0
   while [ $attempt -lt 10 ] ; do
     new_kill_pid=""
+    kill_pids2=""
     for p in $kill_pids ; do
       kill -0 $p 2> /dev/null
       if [ $? -eq 0 ] ; then
         new_kill_pid="$p $new_kill_pid"
+        kill_pids2="-$p $kill_pids2"
       fi
     done
     kill_pids=$new_kill_pid
@@ -211,9 +256,14 @@ if [ -f "$fs_ndb/$pidfile" ] ; then
     sleep 1
     attempt=`expr $attempt + 1`
   done
-  if [ "$kill_pids" != "" ] ; then
-    echo "Failed to shutdown ndbcluster, executing kill -9 "$kill_pids
-    kill -9 $kill_pids
+  if [ "$kill_pids2" != "" ] ; then
+    echo "Failed to shutdown ndbcluster, executing kill "$kill_pids2
+    kill          -9 -- $kill_pids2 2> /dev/null
+    /bin/kill     -9 -- $kill_pids2 2> /dev/null
+    /usr/bin/kill -9 -- $kill_pids2 2> /dev/null
+    kill          -9    $kill_pids2 2> /dev/null
+    /bin/kill     -9    $kill_pids2 2> /dev/null
+    /usr/bin/kill -9    $kill_pids2 2> /dev/null
   fi
   rm "$fs_ndb/$pidfile"
 fi

mysql-test/r/ctype_ucs.result

@@ -480,3 +480,10 @@ a	0061
 b	0062
 c	0063
 drop table t1;
+set @ivar= 1234;
+set @str1 = 'select ?';
+set @str2 = convert(@str1 using ucs2);
+prepare stmt1 from @str2;
+execute stmt1 using @ivar;
+?
+1234

mysql-test/r/fulltext.result

@@ -355,9 +355,9 @@ t	collation(t)
 aus Osnabrck	utf8_general_ci
 SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST ('Osnabrueck');
 t	collation(t)
-SELECT t, collation(t),MATCH t AGAINST ('Osnabruck') FROM t1 WHERE MATCH t AGAINST ('Osnabruck');
-t	collation(t)	MATCH t AGAINST ('Osnabruck')
-aus Osnabrck	utf8_general_ci	1.591139793396
+SELECT t, collation(t),FORMAT(MATCH t AGAINST ('Osnabruck'),6) FROM t1 WHERE MATCH t AGAINST ('Osnabruck');
+t	collation(t)	FORMAT(MATCH t AGAINST ('Osnabruck'),6)
+aus Osnabrck	utf8_general_ci	1.591140
 alter table t1 modify t varchar(200) collate latin1_german2_ci not null;
 Warnings:
 Warning	1265	Data truncated for column 't' at row 3

mysql-test/r/func_in.result

@@ -179,3 +179,9 @@ select 1 in ('1.1',2);
 select 1 in ('1.1',2.0);
 1 in ('1.1',2.0)
 0
+create table t1 (a char(20) character set binary);
+insert into t1 values ('aa'), ('bb');
+select * from t1 where a in (NULL, 'aa');
+a
+aa
+drop table t1;

mysql-test/r/ndb_basic.result

@@ -40,6 +40,11 @@ SELECT * FROM t1 ORDER BY pk1;
 pk1	attr1	attr2	attr3
 3	1	NULL	9412
 9412	9413	17	9413
+UPDATE t1 SET pk1=4 WHERE pk1 = 3;
+SELECT * FROM t1 ORDER BY pk1;
+pk1	attr1	attr2	attr3
+4	1	NULL	9412
+9412	9413	17	9413
 DELETE FROM t1;
 SELECT * FROM t1;
 pk1	attr1	attr2	attr3

mysql-test/r/user_var.result

@@ -195,3 +195,7 @@ SET @`v`:=_ucs2 0x006100620063 COLLATE ucs2_general_ci;
 SET TIMESTAMP=10000;
 insert into t2 values (@v);
 drop table t1, t2;
+set @var= NULL ;
+select FIELD( @var,'1it','Hit') as my_column;
+my_column
+0

mysql-test/t/rpl_failed_optimize-master.opt

+--innodb-lock-wait-timeout=1