summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorDaniel Black <daniel.black@au.ibm.com>2017-01-23 13:32:57 +1100
committerDaniel Black <daniel.black@au.ibm.com>2017-01-23 14:13:53 +1100
commit10b1f4dd093cb2b21aa9ed09dc453bc52d028b3d (patch)
tree9296a14f9fd64324d59353232c8c159409cd27b5 /mysql-test/include
parentb7b4c332c0869676ef69276ddaef4ac4521cb04f (diff)
downloadmariadb-git-10b1f4dd093cb2b21aa9ed09dc453bc52d028b3d.tar.gz
MDEV-11866: ANALYZE FORMAT=JSON not predicatable for r_total_time_ms/r_buffer_size
[0-9]*[.]?[0-9]* wasn't a sufficient regex to cover the %lg used in Json_writer::add_double. Exponent formats where missed. Here we normalize all the replace_regex expressions for ANALYZE FORMAT=JSON into one include file. Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/analyze-format.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/include/analyze-format.inc b/mysql-test/include/analyze-format.inc
new file mode 100644
index 00000000000..65e61b81582
--- /dev/null
+++ b/mysql-test/include/analyze-format.inc
@@ -0,0 +1,3 @@
+# The time on ANALYSE FORMAT=JSON is rather variable
+
+--replace_regex /("(r_total_time_ms|r_buffer_size)": )[^, \n]*/\1"REPLACED"/