Merging upstream version 1:11.4.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 23 insertions, 3 deletions

diff --git a/scripts/convert-debug-for-diff.sh b/scripts/convert-debug-for-diff.sh
index 5b3ce05b..3a22c745 100755
--- a/scripts/convert-debug-for-diff.sh
+++ b/scripts/convert-debug-for-diff.sh
@@ -18,8 +18,28 @@
 
 while (<>)
 {
-  s/^T@[0-9]+\s*://g;
-  s/0x[0-9a-f]+(\s|\n|\))/#$1/g;
-  s/size: [0-9]+/size: #/g;
+  s/^T@[0-9]+ *://g;
+  s/0x[0-9a-f]+(\s|\n|\)|=|,|;)/#$1/g;
+  s/bitmap: [0-9a-fA-F]+$/bitmap: #/g;
+  s/size: [0-9-]+/size: #/g;
+  s/memory_used: [0-9]+/memory_used: #/g;
+  s/memory_used: -[0-9]+/memory_used: #/g;
+  s/Total alloc: [0-9]+/Total alloc: #/g;
+  s/(proc_info: )(.*:)[\d]+ /$1 /;
+  s/(select_cond.*) at line.*/$1/;
+  s/\(id: \d+ -> \d+\)/id: #->#/g;
+  s/(exit: found key at )\d+/$1#/g;
+  s/enter_stage: (.* at).*/enter_stage $1 ../g;
+  s/crc: [0-9]+/crc: #/g;
+  s/ref_count: [0-9]+/ref_count: #/g;
+  s/block: # \(\d+\)/block: # (#)/g;
+  s/delete_mutex: #  mutex: #  \(id: \d+ \<\- \d+\)/delete_mutex: #  mutex: #  (id: # <- #)/g;
+  s/ShortTrID: [0-9]+/ShortTrID: #/g;
+  s/timestamp:[0-9]+/timestamp:#/g;
+  s/#sql_.*_(\d+)/#sql_xxx_$1/g;
+  s/fd: [0-9]+/fd: #/g;
+  s/query_id: (\d+)/query_id: #/g;
+  s|: .*/mysql-test/var/tmp/mysqld\.\d|: var/tmp/mysqld|g;
+  s|: .*\\mysql-test\\var\\tmp\\mysqld\.\d|: var/tmp/mysqld|g;
   print $_;
 }