Commit 4666f015 authored by Sergei Golubchik's avatar Sergei Golubchik

mroonga after-merge test fixes

"sed -r" fails on labrador. Don't use sed, use perl.
parent d7349e20
......@@ -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`;
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
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment