mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

mroonga after-merge test fixes

Browse source 
"sed -r" fails on labrador. Don't use sed, use perl.
This commit is contained in:
Sergei Golubchik 2017-11-14 11:12:13 +08:00
commit 4666f01534
8 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/mroonga/mysql-test/mroonga/include/mroonga/have_mroonga_helper.inc
View file

@ -14,4 +14,4 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
let $MYSQLD_DATADIR= `select @@datadir`;
let MYSQLD_DATADIR= `select @@datadir`;

8
storage/mroonga/mysql-test/mroonga/include/mroonga/print_groonga_query_log.inc Normal file
View file

@ -0,0 +1,8 @@
SHOW GLOBAL VARIABLES LIKE "mroonga_query_log_file";
perl;
open(F, '<', $_="$ENV{MYSQLD_DATADIR}/groonga-query-log.log") or die "open(<$_): $!";
while (<F>) {
s/^[^|]+\|[^|]+\|[^|]+\| *//;
print;
}
EOF

3
storage/mroonga/mysql-test/mroonga/storage/t/variable_query_log_file_disabled_empty_value.test
View file

@ -21,8 +21,7 @@
SET GLOBAL mroonga_log_file = "groonga-query-log.log";
SET GLOBAL mroonga_query_log_file = "";
SHOW GLOBAL VARIABLES LIKE "mroonga_query_log_file";
--exec sed -r -e 's/^[^|]+\|[^|]+\|[^|]+\| *//' $MYSQLD_DATADIR/groonga-query-log.log
--source ../../include/mroonga/print_groonga_query_log.inc
SET GLOBAL mroonga_query_log_file = DEFAULT;
SET GLOBAL mroonga_log_file = DEFAULT;

3
storage/mroonga/mysql-test/mroonga/storage/t/variable_query_log_file_disabled_null_value.test
View file

@ -21,8 +21,7 @@
SET GLOBAL mroonga_log_file = "groonga-query-log.log";
SET GLOBAL mroonga_query_log_file = NULL;
SHOW GLOBAL VARIABLES LIKE "mroonga_query_log_file";
--exec sed -r -e 's/^[^|]+\|[^|]+\|[^|]+\| *//' $MYSQLD_DATADIR/groonga-query-log.log
--source ../../include/mroonga/print_groonga_query_log.inc
SET GLOBAL mroonga_query_log_file = DEFAULT;
SET GLOBAL mroonga_log_file = DEFAULT;

3
storage/mroonga/mysql-test/mroonga/storage/t/variable_query_log_file_enabled_empty_value.test
View file

@ -23,8 +23,7 @@ SET GLOBAL mroonga_query_log_file = "groonga-query.log";
SET GLOBAL mroonga_log_file = "groonga-query-log.log";
SET GLOBAL mroonga_query_log_file = "";
SHOW GLOBAL VARIABLES LIKE "mroonga_query_log_file";
--exec sed -r -e 's/^[^|]+\|[^|]+\|[^|]+\| *//' $MYSQLD_DATADIR/groonga-query-log.log
--source ../../include/mroonga/print_groonga_query_log.inc
SET GLOBAL mroonga_query_log_file = DEFAULT;
SET GLOBAL mroonga_log_file = DEFAULT;

3
storage/mroonga/mysql-test/mroonga/storage/t/variable_query_log_file_enabled_null_value.test
View file

@ -23,8 +23,7 @@ SET GLOBAL mroonga_query_log_file = "groonga-query.log";
SET GLOBAL mroonga_log_file = "groonga-query-log.log";
SET GLOBAL mroonga_query_log_file = NULL;
SHOW GLOBAL VARIABLES LIKE "mroonga_query_log_file";
--exec sed -r -e 's/^[^|]+\|[^|]+\|[^|]+\| *//' $MYSQLD_DATADIR/groonga-query-log.log
--source ../../include/mroonga/print_groonga_query_log.inc
SET GLOBAL mroonga_query_log_file = DEFAULT;
SET GLOBAL mroonga_log_file = DEFAULT;

3
storage/mroonga/mysql-test/mroonga/storage/t/variable_query_log_file_new_value.test
View file

@ -23,8 +23,7 @@
SET GLOBAL mroonga_log_file = "groonga-query-log.log";
SET GLOBAL mroonga_query_log_file = "groonga-query.log";
SHOW GLOBAL VARIABLES LIKE "mroonga_query_log_file";
--exec sed -r -e 's/^[^|]+\|[^|]+\|[^|]+\| *//' $MYSQLD_DATADIR/groonga-query-log.log
--source ../../include/mroonga/print_groonga_query_log.inc
SET GLOBAL mroonga_query_log_file = DEFAULT;
SET GLOBAL mroonga_log_file = DEFAULT;

3
storage/mroonga/mysql-test/mroonga/storage/t/variable_query_log_file_same_value.test
View file

@ -24,8 +24,7 @@ SET GLOBAL mroonga_query_log_file = "groonga-query.log";
SET GLOBAL mroonga_log_file = "groonga-query-log.log";
SET GLOBAL mroonga_query_log_file = "groonga-query.log";
SHOW GLOBAL VARIABLES LIKE "mroonga_query_log_file";
--exec sed -r -e 's/^[^|]+\|[^|]+\|[^|]+\| *//' $MYSQLD_DATADIR/groonga-query-log.log
--source ../../include/mroonga/print_groonga_query_log.inc
SET GLOBAL mroonga_query_log_file = DEFAULT;
SET GLOBAL mroonga_log_file = DEFAULT;