Commit f371303e authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-4.1-maint 

into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
parents 72a997c0 e203f0e5

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

+4864 −2672

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/include/check-testcase.test

0 → 100644
+49 −0
Original line number Diff line number Diff line 
#

# This test is executed twice for each test case if mysql-test-run is passed

# the flag --check-testcase.

# Before every testcase it's run with mysqltest in record mode and will

# thus produce an output file

# that can be compared to output from after the tescase.

# In that way it's possible to check that a testcase does not have

# any unwanted side affects.

#



#

# Dump all global variables

#

show global variables;



#

# Dump all databases

#

show databases;



#

# Dump the "test" database, all it's tables and their data

#

--exec $MYSQL_DUMP --skip-comments test



#

# Dump the "mysql" database and it's tables

# Select data separately to add "order by"

#

--exec $MYSQL_DUMP --skip-comments --no-data mysql

use mysql;

select * from columns_priv;

select * from db order by host, db, user;

select * from func;

select * from help_category;

select * from help_keyword;

select * from help_relation;

select * from help_relation;

select * from host;

select * from tables_priv;

select * from time_zone;

select * from time_zone_leap_second;

select * from time_zone_name;

select * from time_zone_transition;

select * from time_zone_transition_type;

select * from user;

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;