Commit 471798a1 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
BitKeeper/deleted/.del-mtr_stress.pl:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
BitKeeper/deleted/.del-mtr_im.pl:
  Delete: mysql-test/lib/mtr_im.pl
client/mysqltest.c:
  Use remote
mysql-test/mysql-test-run.pl:
  Use remote
mysql-test/lib/mtr_process.pl:
  Use remote
parents b26fb43b ca9faacf

Makefile.am

+5 −0
Original line number Diff line number Diff line
@@ -125,6 +125,11 @@ test-force-pl: 
	./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



# Don't update the files from bitkeeper

%::SCCS/s.%

client/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -38,7 +38,9 @@ noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \ 
mysql_SOURCES =			mysql.cc readline.cc sql_string.cc completion_hash.cc

mysqladmin_SOURCES =		mysqladmin.cc

mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(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 \

                                $(yassl_dummy_link_fix)

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

mysqlbinlog_SOURCES =   mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c $(top_srcdir)/mysys/my_new.cc

client/mysqltest.c

+4318 −2886

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/mysqltest_while.inc

deleted100644 → 0
+0 −137
Original line number Diff line number Diff line 
let $1 = 10;

while ($1)

{

while ($1)

{

while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

  echo $1;

  dec $1;

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}