Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
4666f015
Commit
4666f015
authored
Nov 14, 2017
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mroonga after-merge test fixes
"sed -r" fails on labrador. Don't use sed, use perl.
parent
d7349e20
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
15 additions
and
13 deletions
+15
-13
storage/mroonga/mysql-test/mroonga/include/mroonga/have_mroonga_helper.inc
...ysql-test/mroonga/include/mroonga/have_mroonga_helper.inc
+1
-1
storage/mroonga/mysql-test/mroonga/include/mroonga/print_groonga_query_log.inc
...-test/mroonga/include/mroonga/print_groonga_query_log.inc
+8
-0
storage/mroonga/mysql-test/mroonga/storage/t/variable_query_log_file_disabled_empty_value.test
...orage/t/variable_query_log_file_disabled_empty_value.test
+1
-2
storage/mroonga/mysql-test/mroonga/storage/t/variable_query_log_file_disabled_null_value.test
...torage/t/variable_query_log_file_disabled_null_value.test
+1
-2
storage/mroonga/mysql-test/mroonga/storage/t/variable_query_log_file_enabled_empty_value.test
...torage/t/variable_query_log_file_enabled_empty_value.test
+1
-2
storage/mroonga/mysql-test/mroonga/storage/t/variable_query_log_file_enabled_null_value.test
...storage/t/variable_query_log_file_enabled_null_value.test
+1
-2
storage/mroonga/mysql-test/mroonga/storage/t/variable_query_log_file_new_value.test
.../mroonga/storage/t/variable_query_log_file_new_value.test
+1
-2
storage/mroonga/mysql-test/mroonga/storage/t/variable_query_log_file_same_value.test
...mroonga/storage/t/variable_query_log_file_same_value.test
+1
-2
No files found.
storage/mroonga/mysql-test/mroonga/include/mroonga/have_mroonga_helper.inc
View file @
4666f015
...
...
@@ -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`
;
storage/mroonga/mysql-test/mroonga/include/mroonga/print_groonga_query_log.inc
0 → 100644
View file @
4666f015
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
storage/mroonga/mysql-test/mroonga/storage/t/variable_query_log_file_disabled_empty_value.test
View file @
4666f015
...
...
@@ -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
;
...
...
storage/mroonga/mysql-test/mroonga/storage/t/variable_query_log_file_disabled_null_value.test
View file @
4666f015
...
...
@@ -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
;
...
...
storage/mroonga/mysql-test/mroonga/storage/t/variable_query_log_file_enabled_empty_value.test
View file @
4666f015
...
...
@@ -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
;
...
...
storage/mroonga/mysql-test/mroonga/storage/t/variable_query_log_file_enabled_null_value.test
View file @
4666f015
...
...
@@ -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
;
...
...
storage/mroonga/mysql-test/mroonga/storage/t/variable_query_log_file_new_value.test
View file @
4666f015
...
...
@@ -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
;
...
...
storage/mroonga/mysql-test/mroonga/storage/t/variable_query_log_file_same_value.test
View file @
4666f015
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment