Commit 90876da0 authored by unknown's avatar unknown
Browse files

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

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
parents 6a921d5f 0f838479

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ miguel@hegel.local 
miguel@light.

miguel@light.local

miguel@sartre.local

mikron@mikael-ronstr-ms-dator.local

mmatthew@markslaptop.

monty@bitch.mysql.fi

monty@butch.

acinclude.m4

+16 −0
Original line number Diff line number Diff line
@@ -1383,6 +1383,11 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [ 
  --with-ndb-test       Include the NDB Cluster ndbapi test programs],

              [ndb_test="$withval"],

              [ndb_test=no])

  AC_ARG_WITH([ndb-docs],

              [

  --with-ndb-docs       Include the NDB Cluster ndbapi and mgmapi documentation],

              [ndb_docs="$withval"],

              [ndb_docs=no])

                                                                                

  AC_MSG_CHECKING([for NDB Cluster options])

  AC_MSG_RESULT([])
@@ -1422,6 +1427,17 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [ 
      ;;

  esac



  have_ndb_docs=no

  case "$ndb_docs" in

    yes )

      AC_MSG_RESULT([-- including ndbapi and mgmapi documentation])

      have_ndb_docs="yes"

      ;;

    * )

      AC_MSG_RESULT([-- not including ndbapi and mgmapi documentation])

      ;;

  esac



  AC_MSG_RESULT([done.])

])

configure.in

+9 −2
Original line number Diff line number Diff line
@@ -2919,16 +2919,23 @@ then 
fi

AC_SUBST([ndb_transporter_opt_objs])



ndb_opt_subdirs=

ndb_bin_am_ldflags="-static"

if test X"$have_ndb_test" = Xyes

then

  ndb_opt_test_subdirs="test"

  ndb_opt_subdirs="test"

  ndb_bin_am_ldflags=""

fi

if test X"$have_ndb_docs" = Xyes

then

  ndb_opt_subdirs="$ndb_opt_subdirs docs"

  ndb_bin_am_ldflags=""

fi

AC_SUBST([ndb_bin_am_ldflags])

AC_SUBST([ndb_opt_test_subdirs])

AC_SUBST([ndb_opt_subdirs])

AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl

   ndb/src/Makefile ndb/src/common/Makefile dnl

   ndb/docs/Makefile dnl

   ndb/tools/Makefile dnl

   ndb/src/common/debugger/Makefile ndb/src/common/debugger/signaldata/Makefile dnl

   ndb/src/common/portlib/Makefile dnl

libmysql/libmysql.c

+3 −3
Original line number Diff line number Diff line
@@ -1672,19 +1672,19 @@ static int stmt_read_row_no_data(MYSQL_STMT *stmt, unsigned char **row); 
*/



/* 1 (length) + 2 (year) + 1 (month) + 1 (day) */

static const unsigned MAX_DATE_REP_LENGTH= 5;

#define MAX_DATE_REP_LENGTH 5



/*

  1 (length) + 1 (is negative) + 4 (day count) + 1 (hour)

  + 1 (minute) + 1 (seconds) + 4 (microseconds)

*/

static const unsigned MAX_TIME_REP_LENGTH= 13;

#define MAX_TIME_REP_LENGTH 13



/*

  1 (length) + 2 (year) + 1 (month) + 1 (day) +

  1 (hour) + 1 (minute) + 1 (second) + 4 (microseconds)

*/

static const unsigned MAX_DATETIME_REP_LENGTH= 12;

#define MAX_DATETIME_REP_LENGTH 12





/**************** Misc utility functions ****************************/

mysql-test/mysql-test-run.sh

+1 −1
Original line number Diff line number Diff line
@@ -1439,7 +1439,7 @@ then 
  if [ -z "$USE_RUNNING_NDBCLUSTER" ]

  then

    echo "Starting ndbcluster"

    ./ndb/ndbcluster --initial --data-dir=$MYSQL_TEST_DIR/var || exit 1

    ./ndb/ndbcluster --small --discless --initial --data-dir=$MYSQL_TEST_DIR/var || exit 1

    export NDB_CONNECTSTRING=`cat Ndb.cfg`

  else

    export NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER"