Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)

BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysqld_error.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
mysql-test/r/null.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged

.bzrignore

@@ -742,6 +742,7 @@ ndb/tools/ndb_drop_table
 ndb/tools/ndb_select_all
 ndb/tools/ndb_select_count
 ndb/tools/ndb_show_tables
+ndb/tools/ndb_test_platform
 ndb/tools/ndb_waiter
 pull.log
 regex/re

acinclude.m4

@@ -1614,9 +1614,14 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
   --with-ndb-docs       Include the NDB Cluster ndbapi and mgmapi documentation],
               [ndb_docs="$withval"],
               [ndb_docs=no])
+  AC_ARG_WITH([ndb-port],
+              [
+  --with-ndb-port       Port for NDB Cluster management server],
+              [ndb_port="$withval"],
+              [ndb_port="default"])
   AC_ARG_WITH([ndb-port-base],
               [
-  --with-ndb-port-base  Base port for NDB Cluster],
+  --with-ndb-port-base  Base port for NDB Cluster transporters],
               [ndb_port_base="$withval"],
               [ndb_port_base="default"])
                                                                                 

configure.in

@@ -3065,9 +3065,15 @@ AC_SUBST([NDB_DEFS])
 AC_SUBST([ndb_cxxflags_fix])
 
 
+if test X"$ndb_port" = Xdefault
+then
+  ndb_port="1186"
+fi
+AC_SUBST([ndb_port])
+
 if test X"$ndb_port_base" = Xdefault
 then
-  ndb_port_base="2200"
+  ndb_port_base="2202"
 fi
 AC_SUBST([ndb_port_base])
 
@@ -3106,7 +3112,6 @@ AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl
    ndb/src/common/logger/Makefile dnl
    ndb/src/common/transporter/Makefile dnl
    ndb/src/common/mgmcommon/Makefile dnl
-   ndb/src/common/editline/Makefile dnl
    ndb/src/kernel/Makefile dnl
    ndb/src/kernel/error/Makefile dnl
    ndb/src/kernel/blocks/Makefile dnl

dbug/dbug.c

@@ -227,14 +227,15 @@ static my_bool init_done = FALSE; /* Set to TRUE when initialization done */
 static struct state *stack=0;
 
 typedef struct st_code_state {
-  int lineno;			/* Current debugger output line number */
-  int level;			/* Current function nesting level */
   const char *func;		/* Name of current user function */
   const char *file;		/* Name of current user file */
   char **framep;		/* Pointer to current frame */
-  int jmplevel;			/* Remember nesting level at setjmp () */
   const char *jmpfunc;		/* Remember current function for setjmp */
   const char *jmpfile;		/* Remember current file for setjmp */
+  int lineno;			/* Current debugger output line number */
+  int level;			/* Current function nesting level */
+  int disable_output;		/* Set to it if output is disabled */
+  int jmplevel;			/* Remember nesting level at setjmp () */
 
 /*
  *	The following variables are used to hold the state information
@@ -247,8 +248,8 @@ typedef struct st_code_state {
  */
 
   uint u_line;			/* User source code line number */
-  const char *u_keyword;	/* Keyword for current macro */
   int  locked;			/* If locked with _db_lock_file */
+  const char *u_keyword;	/* Keyword for current macro */
 } CODE_STATE;
 
 	/* Parse a debug command string */
@@ -370,8 +371,10 @@ static CODE_STATE *code_state(void)
 #define code_state() (&static_code_state)
 #define pthread_mutex_lock(A) {}
 #define pthread_mutex_unlock(A) {}
-static CODE_STATE  static_code_state = { 0,0,"?func","?file",NULL,0,NULL,
-					 NULL,0,"?",0};
+static CODE_STATE static_code_state=
+{
+  "?func", "?file", NULL, NullS, NullS, 0,0,0,0,0,0, NullS
+};
 #endif
 
 
@@ -728,9 +731,12 @@ char ***_sframep_ __attribute__((unused)))
     if (DoProfile ())
     {
       long stackused;
-      if (*state->framep == NULL) {
+      if (*state->framep == NULL)
+      {
 	stackused = 0;
-      } else {
+      }
+      else
+      {
 	stackused = ((long)(*state->framep)) - ((long)(state->framep));
 	stackused = stackused > 0 ? stackused : -stackused;
       }
@@ -744,7 +750,7 @@ char ***_sframep_ __attribute__((unused)))
       (void) fflush (_db_pfp_);
     }
 #endif
-    if (DoTrace (state))
+    if (DoTrace(state))
     {
       if (!state->locked)
 	pthread_mutex_lock(&THR_LOCK_dbug);
@@ -754,7 +760,7 @@ char ***_sframep_ __attribute__((unused)))
       dbug_flush (state);			/* This does a unlock */
     }
 #ifdef SAFEMALLOC
-    if (stack -> flags & SANITY_CHECK_ON)
+    if (stack->flags & SANITY_CHECK_ON && !state->disable_output)
       if (_sanity(_file_,_line_))		/* Check of safemalloc */
 	stack -> flags &= ~SANITY_CHECK_ON;
 #endif
@@ -809,9 +815,11 @@ uint *_slevel_)
       else
       {
 #ifdef SAFEMALLOC
-	if (stack -> flags & SANITY_CHECK_ON)
+	if (stack->flags & SANITY_CHECK_ON && !state->disable_output)
+        {
 	  if (_sanity(*_sfile_,_line_))
 	    stack->flags &= ~SANITY_CHECK_ON;
+        }
 #endif
 #ifndef THREAD
 	if (DoProfile ())
@@ -954,7 +962,6 @@ uint length)
   int pos;
   char dbuff[90];
   CODE_STATE *state;
-  /* Sasha: pre-my_thread_init() safety */
   if (!(state=code_state()))
     return;
 
@@ -994,6 +1001,25 @@ uint length)
   }
 }
 
+
+/*
+  Enable/Disable output for this thread
+
+  SYNOPSIS
+    _db_output_()
+    flag		1 = enable output, 0 = disable_output
+
+*/
+
+void _db_output_(uint flag)
+{
+  CODE_STATE *state;
+  if (!(state=code_state()))
+    return;
+  state->disable_output= !flag;
+}
+
+
 /*
  *  FUNCTION
  *
@@ -1159,7 +1185,7 @@ static BOOLEAN DoTrace (CODE_STATE *state)
 {
   reg2 BOOLEAN trace=FALSE;
 
-  if (TRACING &&
+  if (TRACING && !state->disable_output &&
       state->level <= stack -> maxdepth &&
       InList (stack -> functions, state->func) &&
       InList (stack -> processes, _db_process_))
@@ -1195,7 +1221,7 @@ static BOOLEAN DoProfile ()
   state=code_state();
 
   profile = FALSE;
-  if (PROFILING &&
+  if (PROFILING && !state->disable_output &&
       state->level <= stack -> maxdepth &&
       InList (stack -> p_functions, state->func) &&
       InList (stack -> processes, _db_process_))
@@ -1242,7 +1268,7 @@ const char *keyword)
   if (!(state=code_state()))
     return FALSE;
   result = FALSE;
-  if (DEBUGGING &&
+  if (DEBUGGING && !state->disable_output &&
       state->level <= stack -> maxdepth &&
       InList (stack -> functions, state->func) &&
       InList (stack -> keywords, keyword) &&

include/my_dbug.h

@@ -38,6 +38,7 @@ extern	void _db_pargs_(uint _line_,const char *keyword);
 extern	void _db_doprnt_ _VARARGS((const char *format,...));
 extern	void _db_dump_(uint _line_,const char *keyword,const char *memory,
 		       uint length);
+extern	void _db_output_();
 extern	void _db_lock_file();
 extern	void _db_unlock_file();
 
@@ -66,6 +67,7 @@ extern	void _db_unlock_file();
 #define DEBUGGER_ON  _no_db_=0
 #define DBUG_LOCK_FILE { _db_lock_file(); }
 #define DBUG_UNLOCK_FILE { _db_unlock_file(); }
+#define DBUG_OUTPUT(A) { _db_output_(A); }
 #define DBUG_ASSERT(A) assert(A)
 #else						/* No debugger */
 
@@ -86,6 +88,7 @@ extern	void _db_unlock_file();
 #define DEBUGGER_ON
 #define DBUG_LOCK_FILE
 #define DBUG_UNLOCK_FILE
+#define DBUG_OUTPUT(A)
 #define DBUG_ASSERT(A) {}
 #endif
 #ifdef	__cplusplus

include/my_global.h

@@ -370,6 +370,12 @@ int	__void__;
 #define LINT_INIT(var)
 #endif
 
+#if defined(_lint) || defined(FORCE_INIT_OF_VARS) || defined(HAVE_purify)
+#define PURIFY_OR_LINT_INIT(var) var=0
+#else
+#define PURIFY_OR_LINT_INIT(var)
+#endif
+
 /* Define some useful general macros */
 #if defined(__cplusplus) && defined(__GNUC__)
 #define max(a, b)	((a) >? (b))

include/my_sys.h

@@ -221,6 +221,7 @@ extern ulong	my_cache_w_requests, my_cache_write, my_cache_r_requests,
 		my_cache_read;
 extern ulong	my_blocks_used, my_blocks_changed;
 extern ulong	my_file_opened,my_stream_opened, my_tmp_file_created;
+extern uint	mysys_usage_id;
 extern my_bool	my_init_done;
 
 					/* Point to current my_message() */

include/mysql.h

@@ -490,6 +490,8 @@ MYSQL_RES *     STDCALL mysql_list_fields(MYSQL *mysql, const char *table,
 					  const char *wild);
 unsigned long	STDCALL mysql_escape_string(char *to,const char *from,
 					    unsigned long from_length);
+unsigned long	STDCALL mysql_hex_string(char *to,const char *from,
+                                         unsigned long from_length);
 unsigned long STDCALL mysql_real_escape_string(MYSQL *mysql,
 					       char *to,const char *from,
 					       unsigned long length);

innobase/include/dict0dict.ic

@@ -342,13 +342,16 @@ dict_index_rec_get_sys_col(
 		ut_ad(len == 7);
 	
 		return(trx_read_roll_ptr(field));
-	} else if ((type == DATA_ROW_ID) || (type == DATA_MIX_ID)) {
+	} else if (type == DATA_TRX_ID) {
+
+		return(trx_read_trx_id(field));
+	} else if (type == DATA_MIX_ID) {
 
 		return(mach_dulint_read_compressed(field));
 	} else {
-		ut_ad(type == DATA_TRX_ID);
+		ut_a(type == DATA_ROW_ID);
 
-		return(trx_read_trx_id(field));
+		return(mach_read_from_6(field));
 	}
 }
 

mysql-test/Makefile.am

@@ -37,7 +37,7 @@ 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
+EXTRA_PROGRAMS =		mysql_test_run_new
 noinst_HEADERS =	my_manage.h
 mysql_test_run_new_SOURCES=		mysql_test_run_new.c my_manage.c
 

mysql-test/my_manage.c

@@ -30,7 +30,8 @@
 #ifndef __WIN__
 #include <sys/wait.h>
 #include <unistd.h>
-#include <fnmatch.h>
+#include <signal.h>
+#include <fnmatch.h>                            /* FIXME HAVE_FNMATCH_H or something */
 #else
 #include <direct.h>
 #include <stdlib.h>
@@ -100,7 +101,7 @@ void init_args(arg_list_t *al)
 void add_arg(arg_list_t *al, const char *format, ...)
 {
   va_list ap;
-  char temp[PATH_MAX];
+  char temp[FN_REFLEN];
 
   ASSERT(al != NULL);
 
@@ -230,10 +231,10 @@ int wait_for_server_start(char *bin_dir __attribute__((unused)),
 {
   arg_list_t al;
   int err= 0, i;
-  char trash[PATH_MAX];
+  char trash[FN_REFLEN];
 
   /* mysqladmin file */
-  snprintf(trash, PATH_MAX, "%s/trash.out",tmp_dir);
+  snprintf(trash, FN_REFLEN, "%s/trash.out",tmp_dir);
 
   /* args */
   init_args(&al);
@@ -490,9 +491,9 @@ int stop_server(char *bin_dir __attribute__((unused)), char *mysqladmin_file,
 {
   arg_list_t al;
   int err= 0;
-  char trash[PATH_MAX];
+  char trash[FN_REFLEN];
 
-  snprintf(trash, PATH_MAX, "%s/trash.out",tmp_dir);
+  snprintf(trash, FN_REFLEN, "%s/trash.out",tmp_dir);
 
   /* args */
   init_args(&al);
@@ -548,7 +549,7 @@ int stop_server(char *bin_dir __attribute__((unused)), char *mysqladmin_file,
 #ifndef __WIN__
 pid_t get_server_pid(char *pid_file)
 {
-  char buf[PATH_MAX];
+  char buf[FN_REFLEN];
   int fd, err;
   char *p;
   pid_t id= 0;
@@ -556,7 +557,7 @@ pid_t get_server_pid(char *pid_file)
   /* discover id */
   fd= open(pid_file, O_RDONLY);
 
-  err= read(fd, buf, PATH_MAX);
+  err= read(fd, buf, FN_REFLEN);
 
   close(fd);
 
@@ -619,7 +620,7 @@ void del_tree(char *dir)
 #ifndef __WIN__
   DIR *parent= opendir(dir);
   struct dirent *entry;
-  char temp[PATH_MAX];
+  char temp[FN_REFLEN];
 
   if (parent == NULL)
   {
@@ -629,22 +630,36 @@ void del_tree(char *dir)
   while ((entry= readdir(parent)) != NULL)
   {
     /* create long name */
-    snprintf(temp, PATH_MAX, "%s/%s", dir, entry->d_name);
+    snprintf(temp, FN_REFLEN, "%s/%s", dir, entry->d_name);
 
     if (entry->d_name[0] == '.')
     {
       /* Skip */
     }
     else
-    if (S_ISDIR(entry->d_type))
     {
-      /* delete subdirectory */
-      del_tree(temp);
-    }
-    else
-    {
-      /* remove file */
-      remove(temp);
+/* FIXME missing test in acinclude.m4 */
+#ifndef STRUCT_DIRENT_HAS_D_TYPE
+      struct stat st;
+
+      if (lstat(entry->d_name, &st) == -1)
+      {
+        /* FIXME error */
+        return;
+      }
+      if (S_ISDIR(st.st_mode))
+#else
+      if (S_ISDIR(entry->d_type))
+#endif
+      {
+        /* delete subdirectory */
+        del_tree(temp);
+      }
+      else
+      {
+        /* remove file */
+        remove(temp);
+      }
     }
   }
   /* remove directory */
@@ -652,10 +667,10 @@ void del_tree(char *dir)
 #else
   struct _finddata_t parent;
   intptr_t handle;
-  char temp[PATH_MAX];
-  char mask[PATH_MAX];
+  char temp[FN_REFLEN];
+  char mask[FN_REFLEN];
 
-  snprintf(mask,MAX_PATH,"%s/*.*",dir);
+  snprintf(mask,FN_REFLEN,"%s/*.*",dir);
 
   if ((handle=_findfirst(mask,&parent)) == -1L)
   {
@@ -665,7 +680,7 @@ void del_tree(char *dir)
   do
   {
     /* create long name */
-    snprintf(temp, PATH_MAX, "%s/%s", dir, parent.name);
+    snprintf(temp, FN_REFLEN, "%s/%s", dir, parent.name);
     if (parent.name[0] == '.')
     {
       /* Skip */
@@ -700,11 +715,11 @@ int removef(const char *format, ...)
 {
 #ifdef __NETWARE__
   va_list ap;
-  char path[PATH_MAX];
+  char path[FN_REFLEN];
 
   va_start(ap, format);
 
-  vsnprintf(path, PATH_MAX, format, ap);
+  vsnprintf(path, FN_REFLEN, format, ap);
 
   va_end(ap);
   return remove(path);
@@ -712,15 +727,15 @@ int removef(const char *format, ...)
 #eldef __WIN__
   {
     va_list ap;
-    char path[PATH_MAX];
+    char path[FN_REFLEN];
     struct _finddata_t parent;
     intptr_t handle;
-    char temp[PATH_MAX];
+    char temp[FN_REFLEN];
     char *p;
 
     va_start(ap, format);
 
-    vsnprintf(path, PATH_MAX, format, ap);
+    vsnprintf(path, FN_REFLEN, format, ap);
 
     va_end(ap);
 
@@ -739,7 +754,7 @@ int removef(const char *format, ...)
     {
       if (! (parent.attrib & _A_SUBDIR))
       {
-        snprintf(temp, PATH_MAX, "%s/%s", path, parent.name);
+        snprintf(temp, FN_REFLEN, "%s/%s", path, parent.name);
         remove(temp);
       }
     }while (_findnext(handle,&parent) == 0);
@@ -749,14 +764,14 @@ int removef(const char *format, ...)
 #else
   DIR *parent;
   struct dirent *entry;
-  char temp[PATH_MAX];
+  char temp[FN_REFLEN];
   va_list ap;
-  char path[PATH_MAX];
+  char path[FN_REFLEN];
   char *p;
   /* Get path with mask */
   va_start(ap, format);
 
-  vsnprintf(path, PATH_MAX, format, ap);
+  vsnprintf(path, FN_REFLEN, format, ap);
 
   va_end(ap);
 
@@ -775,10 +790,21 @@ int removef(const char *format, ...)
   while ((entry= readdir(parent)) != NULL)
   {
     /* entry is not directory and entry matches with mask */
+#ifndef STRUCT_DIRENT_HAS_D_TYPE
+    struct stat st;
+
+    if (lstat(entry->d_name, &st) == -1)
+    {
+      return 1;
+    }
+
+    if (!S_ISDIR(st.st_mode) && !fnmatch(p, entry->d_name,0))
+#else
     if (!S_ISDIR(entry->d_type) && !fnmatch(p, entry->d_name,0))
+#endif
     {
       /* create long name */
-      snprintf(temp, PATH_MAX, "%s/%s", path, entry->d_name);
+      snprintf(temp, FN_REFLEN, "%s/%s", path, entry->d_name);
       /* Delete only files */
       remove(temp);
     }
@@ -795,7 +821,7 @@ int removef(const char *format, ...)
 
 void get_basedir(char *argv0, char *basedir)
 {
-  char temp[PATH_MAX];
+  char temp[FN_REFLEN];
   char *p;
   int position;
 

mysql-test/my_manage.h

@@ -52,8 +52,6 @@ int my_vsnprintf_(char *to, size_t n, const char* value, ...);
 #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

mysql-test/mysql-test-run.sh

@@ -227,7 +227,7 @@ DO_CLIENT_GDB=""
 SLEEP_TIME_AFTER_RESTART=1
 SLEEP_TIME_FOR_DELETE=10
 SLEEP_TIME_FOR_FIRST_MASTER=400		# Enough time to create innodb tables
-SLEEP_TIME_FOR_SECOND_MASTER=30
+SLEEP_TIME_FOR_SECOND_MASTER=400
 SLEEP_TIME_FOR_FIRST_SLAVE=400
 SLEEP_TIME_FOR_SECOND_SLAVE=30
 CHARACTER_SET=latin1
@@ -457,6 +457,9 @@ SMALL_SERVER="--key_buffer_size=1M --sort_buffer=256K --max_heap_table_size=1M"
 
 export MASTER_MYPORT MASTER_MYPORT1 SLAVE_MYPORT MYSQL_TCP_PORT MASTER_MYSOCK MASTER_MYSOCK1
 
+NDBCLUSTER_BASE_PORT=`expr $NDBCLUSTER_PORT + 2`
+NDBCLUSTER_OPTS="--port=$NDBCLUSTER_PORT --port-base=$NDBCLUSTER_BASE_PORT --data-dir=$MYSQL_TEST_DIR/var"
+
 if [ x$SOURCE_DIST = x1 ] ; then
  MY_BASEDIR=$MYSQL_TEST_DIR
 else
@@ -941,11 +944,11 @@ start_ndbcluster()
     echo "Starting ndbcluster"
     if [ "$DO_BENCH" = 1 ]
     then
-      NDBCLUSTER_OPTS=""
+      NDBCLUSTER_EXTRA_OPTS=""
     else
-      NDBCLUSTER_OPTS="--small"
+      NDBCLUSTER_EXTRA_OPTS="--small"
     fi
-    ./ndb/ndbcluster --port-base=$NDBCLUSTER_PORT $NDBCLUSTER_OPTS --diskless --initial --data-dir=$MYSQL_TEST_DIR/var || exit 1
+    ./ndb/ndbcluster $NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --diskless --initial || exit 1
     NDB_CONNECTSTRING="host=localhost:$NDBCLUSTER_PORT"
   else
     NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER"
@@ -963,7 +966,7 @@ stop_ndbcluster()
  if [ -z "$USE_RUNNING_NDBCLUSTER" ]
  then
    # Kill any running ndbcluster stuff
-   ./ndb/ndbcluster --data-dir=$MYSQL_TEST_DIR/var --port-base=$NDBCLUSTER_PORT --stop
+   ./ndb/ndbcluster $NDBCLUSTER_OPTS --stop
  fi
  fi
 }

mysql-test/ndb/Makefile.am

@@ -13,6 +13,8 @@ SUFFIXES = .sh
 .sh:
 	@RM@ -f $@ $@-t
 	@SED@ \
+	  -e 's!@''ndb_port''@!$(ndb_port)!g' \
+	  -e 's!@''ndb_port_base''@!$(ndb_port_base)!g' \
 	  -e 's!@''ndbbindir''@!$(ndbbindir)!g' \
 	  -e 's!@''ndbtoolsdir''@!$(ndbtoolsdir)!g' \
 	  $< > $@-t

mysql-test/ndb/ndbcluster.sh

@@ -5,7 +5,8 @@
 # This scripts starts the table handler ndbcluster
 
 # configurable parameters, make sure to change in mysqlcluterd as well
-port_base="2200"
+port=@ndb_port@
+port_base=@ndb_port_base@
 fsdir=`pwd`
 # end configurable parameters
 
@@ -22,6 +23,7 @@ if [ -d ../sql ] ; then
    exec_ndb=$ndbtop/src/kernel/ndbd
    exec_mgmtsrvr=$ndbtop/src/mgmsrv/ndb_mgmd
    exec_waiter=$ndbtop/tools/ndb_waiter
+   exec_test=$ndbtop/tools/ndb_test_platform
    exec_mgmtclient=$ndbtop/src/mgmclient/ndb_mgm
 else
    BINARY_DIST=1
@@ -34,9 +36,15 @@ else
      exec_mgmtsrvr=$BASEDIR/bin/ndb_mgmd
    fi
    exec_waiter=$BASEDIR/bin/ndb_waiter
+   exec_test=$BASEDIR/bin/ndb_test_platform
    exec_mgmtclient=$BASEDIR/bin/ndb_mgm
 fi
 
+if $exec_test ; then :; else
+  echo "ndb not correctly compiled to support this platform"
+  exit 1
+fi
+
 pidfile=ndbcluster.pid
 cfgfile=Ndb.cfg
 stop_ndb=
@@ -77,6 +85,9 @@ while test $# -gt 0; do
     --data-dir=*)
      fsdir=`echo "$1" | sed -e "s;--data-dir=;;"`
      ;;
+    --port=*)
+     port=`echo "$1" | sed -e "s;--port=;;"`
+     ;;
     --port-base=*)
      port_base=`echo "$1" | sed -e "s;--port-base=;;"`
      ;;
@@ -87,7 +98,7 @@ while test $# -gt 0; do
   shift
 done
 
-fs_ndb="$fsdir/ndbcluster-$port_base"
+fs_ndb="$fsdir/ndbcluster-$port"
 
 NDB_HOME=
 if [ ! -x "$fsdir" ]; then
@@ -113,7 +124,7 @@ exec_ndb="$exec_ndb --no-defaults"
 exec_waiter="$exec_waiter --no-defaults"
 
 ndb_host="localhost"
-ndb_mgmd_port=$port_base
+ndb_mgmd_port=$port
 NDB_CONNECTSTRING="host=$ndb_host:$ndb_mgmd_port"
 export NDB_CONNECTSTRING
 
@@ -151,10 +162,6 @@ if [ -d "$fs_ndb" ]; then :; else
   exit 1
 fi
 
-# set som help variables
-
-port_transporter=`expr $ndb_mgmd_port + 2`
-
 # Start management server as deamon
 
 # Edit file system path and ports in config file
@@ -169,7 +176,7 @@ sed \
     -e s,"CHOOSE_HOSTNAME_".*,"$ndb_host",g \
     -e s,"CHOOSE_FILESYSTEM","$fs_ndb",g \
     -e s,"CHOOSE_PORT_MGM","$ndb_mgmd_port",g \
-    -e s,"CHOOSE_PORT_TRANSPORTER","$port_transporter",g \
+    -e s,"CHOOSE_PORT_TRANSPORTER","$port_base",g \
     < ndb/ndb_config_2_node.ini \
     > "$fs_ndb/config.ini"
 fi

mysql-test/r/alter_table.result

@@ -483,3 +483,13 @@ ERROR 42000: Incorrect table name 't1\\'
 rename table t1 to `t1\\`;
 ERROR 42000: Incorrect table name 't1\\'
 drop table t1;
+create table t1 (a text) character set koi8r;
+insert into t1 values (_koi8r'');
+select hex(a) from t1;
+hex(a)
+D4C5D3D4
+alter table t1 convert to character set cp1251;
+select hex(a) from t1;
+hex(a)
+F2E5F1F2
+drop table t1;