Commit 80282a94 authored by unknown's avatar unknown
Browse files

Merging 4.1 to 5.0 


Build-tools/Do-compile:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysqladmin.cc:
  Auto merged
configure.in:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Resolved NDB conflict between 4.1 and 5.0
parents 0f61fec4 c3272ae7

Build-tools/Do-compile

+1 −0
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ $ENV{"LD_LIBRARY_PATH"}= ("$test_dir/lib" . 
if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest)

{

  my $flags= "";

  my $force= "";

  $flags.= " --with-ndbcluster" if ($opt_with_cluster);

  $flags.= " --force" if (!$opt_one_error);

  log_timestamp();

client/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \ 
 mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen

noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h \

				client_priv.h

mysqladmin_SOURCES =		mysqladmin.cc

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)

innobase/configure.in

+3 −0
Original line number Diff line number Diff line
@@ -110,6 +110,9 @@ esac 
case "$target" in

       i[[4567]]86-*-*)

	 CFLAGS="$CFLAGS -DUNIV_INTEL_X86";;

	 # The compiler on Linux/S390 does not seem to have inlining

       s390-*-*)

	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;

esac



AC_OUTPUT(Makefile os/Makefile ut/Makefile btr/Makefile dnl

mysql-test/r/ctype_uca.result

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ select 'a ' = 'a\t', 'a ' < 'a\t', 'a ' > 'a\t'; 
select 'a  a' > 'a', 'a  \t' < 'a';

'a  a' > 'a'	'a  \t' < 'a'

1	1

select 'c' like '\_' as want0;

want0

0

CREATE TABLE t (

c char(20) NOT NULL

) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

mysql-test/r/ctype_utf8.result

+3 −0
Original line number Diff line number Diff line
@@ -814,3 +814,6 @@ t2 CREATE TABLE `t2` ( 
) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t2;

drop table t1;

select 'c' like '\_' as want0;

want0

0