[Commits] bzr commit into Mariadb 5.2, with Maria 2.0:maria/5.2 branch (knielsen:2820)

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Fri Jul 2 23:33:24 EEST 2010


#At lp:maria/5.2

 2820 knielsen at knielsen-hq.org	2010-07-02
      Fix Sphinx Buildbot failures:
      
       - Fix `make dist` typo.
      
       - Fix test suite when using different sphinx port.
      modified:
        mysql-test/suite/sphinx/sphinx.result
        mysql-test/suite/sphinx/sphinx.test
        storage/sphinx/Makefile.am

=== modified file 'mysql-test/suite/sphinx/sphinx.result'
--- a/mysql-test/suite/sphinx/sphinx.result	2010-07-01 11:16:48 +0000
+++ b/mysql-test/suite/sphinx/sphinx.result	2010-07-02 20:33:21 +0000
@@ -5,7 +5,7 @@ id	w	q
 2	2	test
 4	1	test
 drop table ts;
-create table ts ( id bigint unsigned not null, w int not null, q varchar(255) not null, index(q) ) engine=sphinx connection="sphinx://127.0.0.1:13002/*";
+create table ts ( id bigint unsigned not null, w int not null, q varchar(255) not null, index(q) ) engine=sphinx connection="sphinx://127.0.0.1:SPHINXSEARCH_PORT/*";
 select * from ts where q='test;filter=gid,1;mode=extended';
 id	w	q
 1	2421	test;filter=gid,1;mode=extended
@@ -18,12 +18,12 @@ id	w	q
 select * from ts where q='test;offset=1;limit=1';
 id	w	q
 2	2	test;offset=1;limit=1
-alter table ts connection="sphinx://127.0.0.1:13002/test1";
+alter table ts connection="sphinx://127.0.0.1:SPHINXSEARCH_PORT/test1";
 select id, w from ts where q='one';
 id	w
 1	2
 drop table ts;
-create table ts ( id bigint unsigned not null, w int not null, q varchar(255) not null, gid int not null, _sph_count int not null, index(q) ) engine=sphinx connection="sphinx://127.0.0.1:13002/test1";
+create table ts ( id bigint unsigned not null, w int not null, q varchar(255) not null, gid int not null, _sph_count int not null, index(q) ) engine=sphinx connection="sphinx://127.0.0.1:SPHINXSEARCH_PORT/test1";
 select * from ts;
 id	w	q	gid	_sph_count
 select * from ts where q='';

=== modified file 'mysql-test/suite/sphinx/sphinx.test'
--- a/mysql-test/suite/sphinx/sphinx.test	2010-07-01 11:16:48 +0000
+++ b/mysql-test/suite/sphinx/sphinx.test	2010-07-02 20:33:21 +0000
@@ -6,14 +6,17 @@ eval create table ts ( id bigint unsigne
 select * from ts where q='test';
 drop table ts;
 
+--replace_result $SPHINXSEARCH_PORT SPHINXSEARCH_PORT
 eval create table ts ( id bigint unsigned not null, w int not null, q varchar(255) not null, index(q) ) engine=sphinx connection="sphinx://127.0.0.1:$SPHINXSEARCH_PORT/*";
 select * from ts where q='test;filter=gid,1;mode=extended';
 select * from ts where q='test|one;mode=extended';
 select * from ts where q='test;offset=1;limit=1';
+--replace_result $SPHINXSEARCH_PORT SPHINXSEARCH_PORT
 eval alter table ts connection="sphinx://127.0.0.1:$SPHINXSEARCH_PORT/test1";
 select id, w from ts where q='one';
 drop table ts;
 
+--replace_result $SPHINXSEARCH_PORT SPHINXSEARCH_PORT
 eval create table ts ( id bigint unsigned not null, w int not null, q varchar(255) not null, gid int not null, _sph_count int not null, index(q) ) engine=sphinx connection="sphinx://127.0.0.1:$SPHINXSEARCH_PORT/test1";
 select * from ts;
 select * from ts where q='';

=== modified file 'storage/sphinx/Makefile.am'
--- a/storage/sphinx/Makefile.am	2010-07-02 13:09:28 +0000
+++ b/storage/sphinx/Makefile.am	2010-07-02 20:33:21 +0000
@@ -55,6 +55,6 @@ libsphinx_a_CXXFLAGS =	$(AM_CFLAGS)
 libsphinx_a_CFLAGS =	$(AM_CFLAGS)
 libsphinx_a_SOURCES=	ha_sphinx.cc
 
-EXTRA_DIST =		cmakelists.txt
+EXTRA_DIST =		CMakeLists.txt
 # Don't update the files from bitkeeper
 %::SCCS/s.%



More information about the commits mailing list