summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Nesterenko <brandon.nesterenko@mariadb.com>2021-11-11 06:19:19 -0700
committerBrandon Nesterenko <brandon.nesterenko@mariadb.com>2021-11-11 06:19:19 -0700
commit3163d9e60c0e7d16e1481fb3e0f6fc0baf9e1339 (patch)
tree10e6464504025288d0cb2e2a68f8ff1b4b286955
parentd6d1a1fc21084c81a0795a26e67577c2a718f6ea (diff)
downloadmariadb-git-3163d9e60c0e7d16e1481fb3e0f6fc0baf9e1339.tar.gz
MDEV-26991: CURRENT_TEST: main.mysql_binary_zero_insert 'grep' is not recognized as an internal or external command, operable program or batch file.bb-10.2-MDEV-26991
Removed grep from mysqldump command stream and instead, extend the search_file pattern to search for rows containing binary zeros instead of any occurance of '00' in the input
-rw-r--r--mysql-test/r/mysql_binary_zero_insert.result4
-rw-r--r--mysql-test/t/mysql_binary_zero_insert.test6
2 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/mysql_binary_zero_insert.result b/mysql-test/r/mysql_binary_zero_insert.result
index 0bed7487b3e..3e43c070f07 100644
--- a/mysql-test/r/mysql_binary_zero_insert.result
+++ b/mysql-test/r/mysql_binary_zero_insert.result
@@ -32,8 +32,8 @@ COUNT(*)=8
# Note: We only look for 00 because the 5c only served as an escape
# in parsing.
#
-# MYSQL_DUMP test tb --hex-blob | grep INSERT > MYSQL_TMP_DIR/dump.sql
-FOUND 10 /00/ in dump.sql
+# MYSQL_DUMP test tb --hex-blob > MYSQL_TMP_DIR/dump.sql
+FOUND 8 /\([0-9]+,0x([1-9][0-9])*00([1-9][0-9])*\)/ in dump.sql
#
# Ensure data consistency on mysqlbinlog replay
#
diff --git a/mysql-test/t/mysql_binary_zero_insert.test b/mysql-test/t/mysql_binary_zero_insert.test
index b327c8a4d1e..37a1f1f79ff 100644
--- a/mysql-test/t/mysql_binary_zero_insert.test
+++ b/mysql-test/t/mysql_binary_zero_insert.test
@@ -114,9 +114,9 @@ SELECT COUNT(*)=8 from tb;
--echo # Note: We only look for 00 because the 5c only served as an escape
--echo # in parsing.
--echo #
---echo # MYSQL_DUMP test tb --hex-blob | grep INSERT > MYSQL_TMP_DIR/dump.sql
---exec $MYSQL_DUMP test tb --hex-blob | grep INSERT > $MYSQL_TMP_DIR/dump.sql
---let SEARCH_PATTERN= 00
+--echo # MYSQL_DUMP test tb --hex-blob > MYSQL_TMP_DIR/dump.sql
+--exec $MYSQL_DUMP test tb --hex-blob > $MYSQL_TMP_DIR/dump.sql
+--let SEARCH_PATTERN= \([0-9]+,0x([1-9][0-9])*00([1-9][0-9])*\)
--let SEARCH_FILE= $MYSQL_TMP_DIR/dump.sql
--source include/search_pattern_in_file.inc