From 224f7a97f52d16db697852236c8754cf373bff70 Mon Sep 17 00:00:00 2001 From: Brandon Nesterenko Date: Thu, 11 Nov 2021 06:19:19 -0700 Subject: MDEV-26991: CURRENT_TEST: main.mysql_binary_zero_insert 'grep' is not recognized as an internal or external command, operable program or batch file. 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 --- mysql-test/main/mysql_binary_zero_insert.result | 4 ++-- mysql-test/main/mysql_binary_zero_insert.test | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mysql-test/main/mysql_binary_zero_insert.result b/mysql-test/main/mysql_binary_zero_insert.result index 0bed7487b3e..3e43c070f07 100644 --- a/mysql-test/main/mysql_binary_zero_insert.result +++ b/mysql-test/main/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/main/mysql_binary_zero_insert.test b/mysql-test/main/mysql_binary_zero_insert.test index 21d21740043..37a1f1f79ff 100644 --- a/mysql-test/main/mysql_binary_zero_insert.test +++ b/mysql-test/main/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 -A8 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 -- cgit v1.2.1