Commit 47045937 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/string.c:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents c6c436f8 aad954bb

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -1644,6 +1644,7 @@ ndb/src/kernel/error/liberror.dsp 
ndb/src/kernel/ndbd

ndb/src/kernel/ndbd.dsp

ndb/src/kernel/vm/libkernel.dsp

ndb/src/libndb.ver

ndb/src/libndbclient.dsp

ndb/src/mgmapi/libmgmapi.dsp

ndb/src/mgmclient/libndbmgmclient.dsp
@@ -2638,6 +2639,7 @@ storage/ndb/src/kernel/error/liberror.dsp 
storage/ndb/src/kernel/ndbd

storage/ndb/src/kernel/ndbd.dsp

storage/ndb/src/kernel/vm/libkernel.dsp

storage/ndb/src/libndb.ver

storage/ndb/src/libndbclient.dsp

storage/ndb/src/mgmapi/libmgmapi.dsp

storage/ndb/src/mgmclient/libndbmgmclient.dsp

BitKeeper/etc/collapsed

+8 −0
Original line number Diff line number Diff line
@@ -33,4 +33,12 @@ 
4561bde4qWhz1I8tkItXKex5uniipA

4562ba016dYH0JzszOqZ8p6psbKfnQ

45771031yRCoM_ZfONdYchPvVEgLRg

459a60d8rIxeTuhB3j_QsOwLGdcpng

459a61c9OS8PzIsdviZJDkybJ1y1uA

459a70691aYIfU2ohV0a3P5iTLpO2A

459a7422KF_P7PuU3YQ5qG6ZLEVpiA

459a74e4nRcXppMSBYeQQ5efDkTADg

45ae6628gqKTsUFfnoNExadETVIkbA

45ba4faf2oqu6eR8fqecR3LfSNcYUg

45ba5238-NKl80QVXzdGo8hO9M75Xg

45c0fdfb2mz6NdOIsLenJtf6_ZelTA

cmd-line-utils/readline/display.c

+12 −0
Original line number Diff line number Diff line
@@ -524,6 +524,17 @@ rl_redisplay () 
      wrap_offset = prompt_invis_chars_first_line = 0;

    }



#if defined (HANDLE_MULTIBYTE)	  

#define CHECK_INV_LBREAKS() \

      do { \

	if (newlines >= (inv_lbsize - 2)) \

	  { \

	    inv_lbsize *= 2; \

	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \

            _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \

	  } \

      } while (0)

#else

#define CHECK_INV_LBREAKS() \

      do { \

	if (newlines >= (inv_lbsize - 2)) \
@@ -532,6 +543,7 @@ rl_redisplay () 
	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \

	  } \

      } while (0)

#endif



#if defined (HANDLE_MULTIBYTE)	  

#define CHECK_LPOS() \

config/ac-macros/ha_ndbcluster.m4

+11 −0
Original line number Diff line number Diff line
@@ -278,6 +278,17 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ 
    ndb_bin_am_ldflags=""

  fi



  # libndbclient versioning when linked with GNU ld.

  if $LD --version 2>/dev/null|grep -q GNU; then

    NDB_LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/storage/ndb/src/libndb.ver"

    AC_CONFIG_FILES(storage/ndb/src/libndb.ver)

  fi

  AC_SUBST(NDB_LD_VERSION_SCRIPT)



  AC_SUBST(NDB_SHARED_LIB_MAJOR_VERSION)

  AC_SUBST(NDB_SHARED_LIB_VERSION)





  AC_SUBST(NDB_VERSION_MAJOR)

  AC_SUBST(NDB_VERSION_MINOR)

  AC_SUBST(NDB_VERSION_BUILD)

configure.in

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ DOT_FRM_VERSION=6 
# See the libtool docs for information on how to do shared lib versions.

SHARED_LIB_MAJOR_VERSION=15

SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0

NDB_SHARED_LIB_MAJOR_VERSION=3

NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0

# Set all version vars based on $VERSION. How do we do this more elegant ?

# Remember that regexps needs to quote [ and ] since this is run through m4

MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`
@@ -354,6 +356,7 @@ if $LD --version 2>/dev/null|grep -q GNU; then 
fi

AC_SUBST(LD_VERSION_SCRIPT)





# Avoid bug in fcntl on some versions of linux

AC_MSG_CHECKING([if we should use 'skip-external-locking' as default for $target_os])

# Any variation of Linux