Commit 25d776a8 authored by unknown's avatar unknown
Browse files

Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 

into hundin.mysql.fi:/home/jan/mysql-4.1
parents a46c9b23 49ab428c

client/Makefile.am

+4 −14
Original line number Diff line number Diff line
@@ -20,9 +20,8 @@ 
INCLUDES =			-I$(top_srcdir)/include -I$(top_srcdir)/regex \

				$(openssl_includes)

LIBS =				@CLIENT_LIBS@

DEPLIB=				../libmysql/libmysqlclient.la

REGEXLIB=			../regex/libregex.a

LDADD =				@CLIENT_EXTRA_LDFLAGS@ $(DEPLIB)

LDADD=				@CLIENT_EXTRA_LDFLAGS@ \

                                $(top_builddir)/libmysql/libmysqlclient.la

bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \

 mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen

noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h \
@@ -31,19 +30,10 @@ mysql_SOURCES = mysql.cc readline.cc sql_string.cc completion_hash.cc 
mysqladmin_SOURCES =		mysqladmin.cc

mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)

mysqlbinlog_LDADD =		$(LDADD) $(CXXLDFLAGS)

mysql_DEPENDENCIES=		$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

mysqladmin_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

mysqlcheck_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

mysqlshow_DEPENDENCIES=		$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

mysqldump_DEPENDENCIES=		$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

mysqlimport_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

mysqltest_SOURCES=		mysqltest.c ../mysys/my_getsystime.c

mysqltest_DEPENDENCIES=   	$(LIBRARIES) $(pkglib_LTLIBRARIES) $(REGEXLIB) $(DEPLIB)

mysqltest_LDADD =		$(REGEXLIB) $(LDADD)

mysqltest_SOURCES=		mysqltest.c $(top_srcdir)/mysys/my_getsystime.c

mysqltest_LDADD =		$(top_builddir)/regex/libregex.a $(LDADD)

mysqlbinlog_SOURCES =   mysqlbinlog.cc ../mysys/mf_tempdir.c

mysqlbinlog_DEPENDENCIES=   	$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

mysqlmanagerc_SOURCES =   mysqlmanagerc.c 

mysqlmanagerc_DEPENDENCIES=   	$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

sql_src=log_event.h log_event.cc



# Fix for mit-threads

configure.in

+6 −3
Original line number Diff line number Diff line
@@ -1924,7 +1924,7 @@ AC_CHECK_FUNCS(alarm bcmp bfill bmove bzero chsize cuserid fchmod fcntl \ 
  pthread_key_delete pthread_rwlock_rdlock pthread_setprio \

  pthread_setprio_np pthread_setschedparam pthread_sigmask readlink \

  realpath rename rint rwlock_init setupterm \

  shmget shmat shmdt shmctl sigaction \

  shmget shmat shmdt shmctl sigaction sigemptyset sigaddset \

  sighold sigset sigthreadmask \

  snprintf socket stpcpy strcasecmp strerror strnlen strpbrk strstr strtol \

  strtoll strtoul strtoull tell tempnam thr_setconcurrency vidattr)
@@ -3019,7 +3019,7 @@ AC_SUBST(server_scripts) 
sql_union_dirs=" $sql_server_dirs "

for DIR in $sql_client_dirs

do

  if echo $sql_union_dirs | grep " $DIR " >/dev/null

  if echo " $sql_union_dirs " | grep " $DIR " >/dev/null

  then

    :  # already present, skip

  else
@@ -3098,7 +3098,10 @@ if test "$ac_cv_func_shmget" = "yes" && 
   test "$ac_cv_func_shmat" = "yes" &&

   test "$ac_cv_func_shmdt" = "yes" &&

   test "$ac_cv_func_shmctl" = "yes" &&

   test "$ac_cv_func_sigaction" = "yes"

   test "$ac_cv_func_sigaction" = "yes" &&

   test "$ac_cv_func_sigemptyset" = "yes" &&

   test "$ac_cv_func_sigaddset" = "yes" &&

   test "$ac_cv_func_pthread_sigmask" = "yes"

then

   AC_DEFINE([NDB_SHM_TRANSPORTER], [1],

             [Including Ndb Cluster DB shared memory transporter])

mysql-test/mysql-test-run.sh

+8 −1
Original line number Diff line number Diff line
@@ -241,6 +241,9 @@ USE_EMBEDDED_SERVER="" 
RESULT_EXT=""

TEST_MODE="default"



NDB_MGMD_EXTRA_OPTS=

NDBD_EXTRA_OPTS=



while test $# -gt 0; do

  case "$1" in

    --embedded-server) USE_EMBEDDED_SERVER=1 USE_MANAGER=0 NO_SLAVE=1 ; \
@@ -261,6 +264,10 @@ while test $# -gt 0; do 
    --ndb-connectstring=*)

      USE_NDBCLUSTER="--ndbcluster" ;

      USE_RUNNING_NDBCLUSTER=`$ECHO "$1" | $SED -e "s;--ndb-connectstring=;;"` ;;

    --ndb_mgmd-extra-opts=*)

      NDB_MGMD_EXTRA_OPTS=`$ECHO "$1" | $SED -e "s;--ndb_mgmd-extra-opts=;;"` ;;

    --ndbd-extra-opts=*)

      NDBD_EXTRA_OPTS=`$ECHO "$1" | $SED -e "s;--ndbd-extra-opts=;;"` ;;

    --tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;;

    --local-master)

      MASTER_MYPORT=3306;
@@ -460,7 +467,7 @@ 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"

NDBCLUSTER_OPTS="--port=$NDBCLUSTER_PORT --port-base=$NDBCLUSTER_BASE_PORT --data-dir=$MYSQL_TEST_DIR/var --ndb_mgmd-extra-opts=\"$NDB_MGMD_EXTRA_OPTS\" --ndbd-extra-opts=\"$NDBD_EXTRA_OPTS\""



if [ x$SOURCE_DIST = x1 ] ; then

 MY_BASEDIR=$MYSQL_TEST_DIR

mysql-test/ndb/ndbcluster.sh

+11 −2
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ ndb_con_op=105000 
ndb_dmem=80M

ndb_imem=24M



NDB_MGMD_EXTRA_OPTS=

NDBD_EXTRA_OPTS=



while test $# -gt 0; do

  case "$1" in

    --test)
@@ -94,6 +97,12 @@ while test $# -gt 0; do 
    --port-base=*)

     port_base=`echo "$1" | sed -e "s;--port-base=;;"`

     ;;

    --ndb_mgmd-extra-opts=*)

     NDB_MGMD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndb_mgmd-extra-opts=;;"`

     ;;

    --ndbd-extra-opts=*)

     NDBD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndbd-extra-opts=;;"`

     ;;

    -- )  shift; break ;;

    --* ) $ECHO "Unrecognized option: $1"; exit 1 ;;

    * ) break ;;
@@ -122,8 +131,8 @@ if [ ! -x "$exec_waiter" ]; then 
fi



exec_mgmtclient="$exec_mgmtclient --no-defaults"

exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults"

exec_ndb="$exec_ndb --no-defaults"

exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults $NDB_MGMD_EXTRA_OPTS"

exec_ndb="$exec_ndb --no-defaults $NDBD_EXTRA_OPTS"

exec_waiter="$exec_waiter --no-defaults"



ndb_host="localhost"

mysql-test/r/alter_table.result

+4 −0
Original line number Diff line number Diff line
@@ -493,3 +493,7 @@ select hex(a) from t1; 
hex(a)

F2E5F1F2

drop table t1;

create table t1 ( a timestamp );

alter table t1 add unique ( a(1) );

ERROR HY000: Incorrect sub part key; the used key part isn't a string, the used length is longer than the key part, or the storage engine doesn't support unique sub keys

drop table t1;