Commit 8eae81ba authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bk/mysql-4.1 

into mysql.com:/users/kboortz/daily/work/mysql-4.1-wax
parents 3aff984f 3b3285b3

acinclude.m4

+6 −1
Original line number Diff line number Diff line
@@ -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"])

client/mysqldump.c

+196 −135

File changed.

Preview size limit exceeded, changes collapsed.

configure.in

+7 −1
Original line number Diff line number Diff line
@@ -3052,9 +3052,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])

include/mysql.h

+2 −0
Original line number Diff line number Diff line
@@ -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);

include/mysqld_error.h

+2 −1
Original line number Diff line number Diff line
@@ -319,4 +319,5 @@ 
#define ER_INVALID_CHARACTER_STRING 1300

#define ER_WARN_ALLOWED_PACKET_OVERFLOWED 1301

#define ER_CONFLICTING_DECLARATIONS 1302

#define ER_ERROR_MESSAGES 303
 
#define ER_NO_CONS_READ_ENGINE 1303

#define ER_ERROR_MESSAGES 304