[gentoo-commits] proj/mysql-extras:master commit in: / - gentoo-commits

From:	Thomas Deutschmann <whissi@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/mysql-extras:master commit in: /
Date:	Wed, 14 Feb 2018 00:43:41
Message-Id:	`1518567875.7b6db3c69be46456e84788a875bc7fb8eb09e16f.whissi@gentoo`

1

commit:     7b6db3c69be46456e84788a875bc7fb8eb09e16f

2

Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>

3

AuthorDate: Wed Feb 14 00:06:46 2018 +0000

4

Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>

5

CommitDate: Wed Feb 14 00:24:35 2018 +0000

6

URL:        https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=7b6db3c6

7

8

Add patch to fix monitor.test in MySQL 5.6

9

10

Bug: https://bugs.gentoo.org/645838

11

12

 20031_all_mysql-5.6-fix-monitor.test.patch | 129 +++++++++++++++++++++++++++++

13

 1 file changed, 129 insertions(+)

14

15

diff --git a/20031_all_mysql-5.6-fix-monitor.test.patch b/20031_all_mysql-5.6-fix-monitor.test.patch

16

new file mode 100644

17

index 0000000..14825ff

18

--- /dev/null

19

+++ b/20031_all_mysql-5.6-fix-monitor.test.patch

20

@@ -0,0 +1,129 @@

21

+From https://github.com/MariaDB/server/commit/07977c13e71a9fc4a7695facff5fac9d7ff1e870

22

+From: Monty <monty@×××××××.org>

23

+Date: Tue, 5 Sep 2017 16:24:29 +0300

24

+Subject: [PATCH] Fixed monitor.test to handle statistics >= 10

25

+

26

+Bug: https://bugs.gentoo.org/645838

27

+---

28

+ mysql-test/suite/innodb/r/monitor.result | 30 +++++++++++++++---------------

29

+ mysql-test/suite/innodb/t/monitor.test   | 18 ++++++------------

30

+ 2 files changed, 21 insertions(+), 27 deletions(-)

31

+

32

+diff --git a/mysql-test/suite/innodb/r/monitor.result b/mysql-test/suite/innodb/r/monitor.result

33

+index 33a09a553b98..2700479e7f73 100644

34

+--- a/mysql-test/suite/innodb/r/monitor.result

35

++++ b/mysql-test/suite/innodb/r/monitor.result

36

+@@ -622,46 +622,46 @@ set global innodb_monitor_reset_all = default;

37

+ # MONITORS

38

+ #

39

+ CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;

40

+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

41

++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

42

+ LIKE 'buffer_page_written_index_leaf';

43

+-NAME	COUNT

44

++NAME	COUNT > 0

45

+ buffer_page_written_index_leaf	0

46

+ SET GLOBAL innodb_monitor_enable='module_buffer_page';

47

+ INSERT INTO t1 VALUES (1), (2), (3), (4);

48

+ FLUSH TABLES t1 FOR EXPORT;

49

+ UNLOCK TABLES;

50

+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

51

++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

52

+ LIKE 'buffer_page_written_index_leaf';

53

+-NAME	COUNT

54

+-buffer_page_written_index_leaf	NNNN

55

++NAME	COUNT > 0

56

++buffer_page_written_index_leaf	1

57

+ SET GLOBAL innodb_monitor_disable='module_buffer_page';

58

+ SET GLOBAL innodb_monitor_reset_all='module_buffer_page';

59

+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

60

++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

61

+ LIKE 'buffer_page_written_index_leaf';

62

+-NAME	COUNT

63

++NAME	COUNT > 0

64

+ buffer_page_written_index_leaf	0

65

+ SET GLOBAL innodb_monitor_enable='%';

66

+ INSERT INTO t1 VALUES (5), (6), (7), (8);

67

+ FLUSH TABLES t1 FOR EXPORT;

68

+ UNLOCK TABLES;

69

+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

70

++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

71

+ LIKE 'buffer_page_written_index_leaf';

72

+-NAME	COUNT

73

+-buffer_page_written_index_leaf	NNNN

74

++NAME	COUNT > 0

75

++buffer_page_written_index_leaf	1

76

+ SET GLOBAL innodb_monitor_disable='%';

77

+ SET GLOBAL innodb_monitor_reset_all='%';

78

+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

79

++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

80

+ LIKE 'buffer_page_written_index_leaf';

81

+-NAME	COUNT

82

++NAME	COUNT > 0

83

+ buffer_page_written_index_leaf	0

84

+ SET GLOBAL innodb_monitor_enable='ALL';

85

+ INSERT INTO t1 VALUES (9), (10), (11), (12);

86

+ FLUSH TABLES t1 FOR EXPORT;

87

+ UNLOCK TABLES;

88

+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

89

++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

90

+ LIKE 'buffer_page_written_index_leaf';

91

+-NAME	COUNT

92

+-buffer_page_written_index_leaf	NNNN

93

++NAME	COUNT > 0

94

++buffer_page_written_index_leaf	1

95

+ SET GLOBAL innodb_monitor_enable=default;

96

+ SET GLOBAL innodb_monitor_disable=default;

97

+ SET GLOBAL innodb_monitor_reset_all=default;

98

+diff --git a/mysql-test/suite/innodb/t/monitor.test b/mysql-test/suite/innodb/t/monitor.test

99

+index 98aa4505e341..dfae93694bff 100644

100

+--- a/mysql-test/suite/innodb/t/monitor.test

101

++++ b/mysql-test/suite/innodb/t/monitor.test

102

+@@ -391,41 +391,35 @@ CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;

103

+

104

+ let $innodb_monitor_enable = `SELECT @@innodb_monitor_enable`;

105

+

106

+---replace_regex /[1-9]/NNNN/

107

+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

108

++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

109

+ LIKE 'buffer_page_written_index_leaf';

110

+

111

+ SET GLOBAL innodb_monitor_enable='module_buffer_page';

112

+ INSERT INTO t1 VALUES (1), (2), (3), (4); FLUSH TABLES t1 FOR EXPORT;

113

+ UNLOCK TABLES;

114

+---replace_regex /[1-9]/NNNN/

115

+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

116

++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

117

+ LIKE 'buffer_page_written_index_leaf';

118

+

119

+ SET GLOBAL innodb_monitor_disable='module_buffer_page';

120

+ SET GLOBAL innodb_monitor_reset_all='module_buffer_page';

121

+---replace_regex /[1-9]/NNNN/

122

+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

123

++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

124

+ LIKE 'buffer_page_written_index_leaf';

125

+

126

+ SET GLOBAL innodb_monitor_enable='%';

127

+ INSERT INTO t1 VALUES (5), (6), (7), (8); FLUSH TABLES t1 FOR EXPORT;

128

+ UNLOCK TABLES;

129

+---replace_regex /[1-9]/NNNN/

130

+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

131

++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

132

+ LIKE 'buffer_page_written_index_leaf';

133

+

134

+ SET GLOBAL innodb_monitor_disable='%';

135

+ SET GLOBAL innodb_monitor_reset_all='%';

136

+---replace_regex /[1-9]/NNNN/

137

+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

138

++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

139

+ LIKE 'buffer_page_written_index_leaf';

140

+

141

+ SET GLOBAL innodb_monitor_enable='ALL';

142

+ INSERT INTO t1 VALUES (9), (10), (11), (12); FLUSH TABLES t1 FOR EXPORT;

143

+ UNLOCK TABLES;

144

+---replace_regex /[1-9]/NNNN/

145

+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

146

++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME

147

+ LIKE 'buffer_page_written_index_leaf';

148

+

149

+ --disable_warnings

1	commit: 7b6db3c69be46456e84788a875bc7fb8eb09e16f
2	Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3	AuthorDate: Wed Feb 14 00:06:46 2018 +0000
4	Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5	CommitDate: Wed Feb 14 00:24:35 2018 +0000
6	URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=7b6db3c6
7
8	Add patch to fix monitor.test in MySQL 5.6
9
10	Bug: https://bugs.gentoo.org/645838
11
12	20031_all_mysql-5.6-fix-monitor.test.patch \| 129 +++++++++++++++++++++++++++++
13	1 file changed, 129 insertions(+)
14
15	diff --git a/20031_all_mysql-5.6-fix-monitor.test.patch b/20031_all_mysql-5.6-fix-monitor.test.patch
16	new file mode 100644
17	index 0000000..14825ff
18	--- /dev/null
19	+++ b/20031_all_mysql-5.6-fix-monitor.test.patch
20	@@ -0,0 +1,129 @@
21	+From https://github.com/MariaDB/server/commit/07977c13e71a9fc4a7695facff5fac9d7ff1e870
22	+From: Monty <monty@×××××××.org>
23	+Date: Tue, 5 Sep 2017 16:24:29 +0300
24	+Subject: [PATCH] Fixed monitor.test to handle statistics >= 10
25	+
26	+Bug: https://bugs.gentoo.org/645838
27	+---
28	+ mysql-test/suite/innodb/r/monitor.result \| 30 +++++++++++++++---------------
29	+ mysql-test/suite/innodb/t/monitor.test \| 18 ++++++------------
30	+ 2 files changed, 21 insertions(+), 27 deletions(-)
31	+
32	+diff --git a/mysql-test/suite/innodb/r/monitor.result b/mysql-test/suite/innodb/r/monitor.result
33	+index 33a09a553b98..2700479e7f73 100644
34	+--- a/mysql-test/suite/innodb/r/monitor.result
35	++++ b/mysql-test/suite/innodb/r/monitor.result
36	+@@ -622,46 +622,46 @@ set global innodb_monitor_reset_all = default;
37	+ # MONITORS
38	+ #
39	+ CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
40	+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
41	++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
42	+ LIKE 'buffer_page_written_index_leaf';
43	+-NAME COUNT
44	++NAME COUNT > 0
45	+ buffer_page_written_index_leaf 0
46	+ SET GLOBAL innodb_monitor_enable='module_buffer_page';
47	+ INSERT INTO t1 VALUES (1), (2), (3), (4);
48	+ FLUSH TABLES t1 FOR EXPORT;
49	+ UNLOCK TABLES;
50	+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
51	++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
52	+ LIKE 'buffer_page_written_index_leaf';
53	+-NAME COUNT
54	+-buffer_page_written_index_leaf NNNN
55	++NAME COUNT > 0
56	++buffer_page_written_index_leaf 1
57	+ SET GLOBAL innodb_monitor_disable='module_buffer_page';
58	+ SET GLOBAL innodb_monitor_reset_all='module_buffer_page';
59	+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
60	++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
61	+ LIKE 'buffer_page_written_index_leaf';
62	+-NAME COUNT
63	++NAME COUNT > 0
64	+ buffer_page_written_index_leaf 0
65	+ SET GLOBAL innodb_monitor_enable='%';
66	+ INSERT INTO t1 VALUES (5), (6), (7), (8);
67	+ FLUSH TABLES t1 FOR EXPORT;
68	+ UNLOCK TABLES;
69	+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
70	++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
71	+ LIKE 'buffer_page_written_index_leaf';
72	+-NAME COUNT
73	+-buffer_page_written_index_leaf NNNN
74	++NAME COUNT > 0
75	++buffer_page_written_index_leaf 1
76	+ SET GLOBAL innodb_monitor_disable='%';
77	+ SET GLOBAL innodb_monitor_reset_all='%';
78	+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
79	++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
80	+ LIKE 'buffer_page_written_index_leaf';
81	+-NAME COUNT
82	++NAME COUNT > 0
83	+ buffer_page_written_index_leaf 0
84	+ SET GLOBAL innodb_monitor_enable='ALL';
85	+ INSERT INTO t1 VALUES (9), (10), (11), (12);
86	+ FLUSH TABLES t1 FOR EXPORT;
87	+ UNLOCK TABLES;
88	+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
89	++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
90	+ LIKE 'buffer_page_written_index_leaf';
91	+-NAME COUNT
92	+-buffer_page_written_index_leaf NNNN
93	++NAME COUNT > 0
94	++buffer_page_written_index_leaf 1
95	+ SET GLOBAL innodb_monitor_enable=default;
96	+ SET GLOBAL innodb_monitor_disable=default;
97	+ SET GLOBAL innodb_monitor_reset_all=default;
98	+diff --git a/mysql-test/suite/innodb/t/monitor.test b/mysql-test/suite/innodb/t/monitor.test
99	+index 98aa4505e341..dfae93694bff 100644
100	+--- a/mysql-test/suite/innodb/t/monitor.test
101	++++ b/mysql-test/suite/innodb/t/monitor.test
102	+@@ -391,41 +391,35 @@ CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
103	+
104	+ let $innodb_monitor_enable = `SELECT @@innodb_monitor_enable`;
105	+
106	+---replace_regex /[1-9]/NNNN/
107	+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
108	++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
109	+ LIKE 'buffer_page_written_index_leaf';
110	+
111	+ SET GLOBAL innodb_monitor_enable='module_buffer_page';
112	+ INSERT INTO t1 VALUES (1), (2), (3), (4); FLUSH TABLES t1 FOR EXPORT;
113	+ UNLOCK TABLES;
114	+---replace_regex /[1-9]/NNNN/
115	+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
116	++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
117	+ LIKE 'buffer_page_written_index_leaf';
118	+
119	+ SET GLOBAL innodb_monitor_disable='module_buffer_page';
120	+ SET GLOBAL innodb_monitor_reset_all='module_buffer_page';
121	+---replace_regex /[1-9]/NNNN/
122	+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
123	++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
124	+ LIKE 'buffer_page_written_index_leaf';
125	+
126	+ SET GLOBAL innodb_monitor_enable='%';
127	+ INSERT INTO t1 VALUES (5), (6), (7), (8); FLUSH TABLES t1 FOR EXPORT;
128	+ UNLOCK TABLES;
129	+---replace_regex /[1-9]/NNNN/
130	+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
131	++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
132	+ LIKE 'buffer_page_written_index_leaf';
133	+
134	+ SET GLOBAL innodb_monitor_disable='%';
135	+ SET GLOBAL innodb_monitor_reset_all='%';
136	+---replace_regex /[1-9]/NNNN/
137	+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
138	++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
139	+ LIKE 'buffer_page_written_index_leaf';
140	+
141	+ SET GLOBAL innodb_monitor_enable='ALL';
142	+ INSERT INTO t1 VALUES (9), (10), (11), (12); FLUSH TABLES t1 FOR EXPORT;
143	+ UNLOCK TABLES;
144	+---replace_regex /[1-9]/NNNN/
145	+-SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
146	++SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
147	+ LIKE 'buffer_page_written_index_leaf';
148	+
149	+ --disable_warnings

Gentoo Archives: gentoo-commits