Commit b66640ff authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools 

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
parents 5549ed3a 81d42333

Makefile.am

+5 −0
Original line number Diff line number Diff line
@@ -124,3 +124,8 @@ test-force-pl: 
	cd mysql-test; \

	./mysql-test-run.pl --force && \

	./mysql-test-run.pl --ps-protocol --force



test-force-pl-mem:

	cd mysql-test; \

	./mysql-test-run.pl --force --mem && \

	./mysql-test-run.pl --ps-protocol --force --mem

client/Makefile.am

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

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

mysqltest_SOURCES=		mysqltest.c \

				$(top_srcdir)/mysys/my_getsystime.c \

				$(top_srcdir)/mysys/my_copy.c

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

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

mysqlmanagerc_SOURCES =   mysqlmanagerc.c

client/mysqltest.c

+4855 −2670

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/include/ctype_like_escape.inc

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ insert into t1 values('ab_def'); 
insert into t1 values('abc_ef');

insert into t1 values('abcd_f');

insert into t1 values('abcde_');

-- should return ab_def

# should return ab_def

select c1 as c1u from t1 where c1 like 'ab\_def';

-- should return ab_def

# should return ab_def

select c1 as c2h from t1 where c1 like 'ab#_def' escape '#';

drop table t1;

mysql-test/include/have_multi_ndb.inc

+8 −4
Original line number Diff line number Diff line
@@ -9,8 +9,10 @@ disable_query_log; 
drop table if exists t1, t2;

--enable_warnings

flush tables;

@r/have_ndb.require show variables like "have_ndbcluster";

# @r/server_id.require show variables like "server_id";

--require r/have_ndb.require

show variables like "have_ndbcluster";

#--require r/server_id.require

#show variables like "server_id";

enable_query_log;



# Check that server2 has NDB support
@@ -20,8 +22,10 @@ disable_query_log; 
drop table if exists t1, t2;

--enable_warnings

flush tables;

@r/have_ndb.require show variables like "have_ndbcluster";

# @r/server_id1.require show variables like "server_id";

--require r/have_ndb.require

show variables like "have_ndbcluster";

#--require r@r/server_id1.require

#show variables like "server_id";

enable_query_log;



# Set the default connection to 'server1'