Commit 814723e2 authored by unknown's avatar unknown
Browse files

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

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


BitKeeper/deleted/.del-ps_6bdb.result:
  Auto merged
mysql-test/include/have_multi_ndb.inc:
  Auto merged
mysql-test/include/have_ndb.inc:
  Auto merged
mysql-test/r/log_tables.result:
  Auto merged
mysql-test/r/partition.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
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/crash_commit_before.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 efce1db9 60cd16df

client/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ mysqladmin_SOURCES = mysqladmin.cc 
mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)

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

				$(yassl_dummy_link_fix)

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

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

				$(top_builddir)/mysys/libmysys.a

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

				$(top_srcdir)/mysys/my_new.cc \

				$(top_srcdir)/mysys/my_bit.c \

client/mysqltest.c

+3375 −2573

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/extra/rpl_tests/rpl_flsh_tbls.test

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 


-- source include/master-slave.inc



let $SERVER_VERSION=`select version()`;



create table t1 (a int);

insert into t1 values (10);

create table t2 (a int);

mysql-test/extra/rpl_tests/rpl_truncate_helper.test

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ SELECT * FROM t1; 
--echo **** On Master ****

connection master;

DROP TABLE t1;

let $SERVER_VERSION=`select version()`;

--replace_result $SERVER_VERSION SERVER_VERSION

--replace_regex /\/\* xid=[0-9]+ \*\//\/* xid= *\// /table_id: [0-9]+/table_id: #/

SHOW BINLOG EVENTS;

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;