database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.6 into 10.11

Browse Source 
Some fixes related to commit f838b2d799 and
Rows_log_event::do_apply_event() and Update_rows_log_event::do_exec_row()
for system-versioned tables were provided by Nikita Malyavin.
This was required by test versioning.rpl,trx_id,row.
This commit is contained in:
Marko Mäkelä
2024-03-28 09:16:57 +02:00
parent 6efa75a8cb ccb7a1e9a1
commit 788953463d
319 changed files with 7106 additions and 3441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
mysql-test/suite/perfschema/r/nesting.result
View File

@ -127,10 +127,10 @@ relative_event_id relative_end_event_id event_name comment nesting_event_type re
10 10 stage/sql/Optimizing (stage) STATEMENT 0
11 11 stage/sql/Executing (stage) STATEMENT 0
12 12 stage/sql/End of update loop (stage) STATEMENT 0
13 13 stage/sql/Query end (stage) STATEMENT 0
14 15 stage/sql/Commit (stage) STATEMENT 0
15 15 wait/synch/mutex/sql/THD::LOCK_thd_kill lock STAGE 14
16 16 stage/sql/closing tables (stage) STATEMENT 0
13 14 stage/sql/Query end (stage) STATEMENT 0
14 14 wait/synch/mutex/sql/THD::LOCK_thd_kill lock STAGE 13
15 15 stage/sql/closing tables (stage) STATEMENT 0
16 16 stage/sql/Query end (stage) STATEMENT 0
17 17 stage/sql/Starting cleanup (stage) STATEMENT 0
18 18 stage/sql/Freeing items (stage) STATEMENT 0
19 19 wait/io/socket/sql/client_connection send STATEMENT 0
@ -151,10 +151,10 @@ relative_event_id relative_end_event_id event_name comment nesting_event_type re
34 34 stage/sql/Optimizing (stage) STATEMENT 24
35 35 stage/sql/Executing (stage) STATEMENT 24
36 36 stage/sql/End of update loop (stage) STATEMENT 24
37 37 stage/sql/Query end (stage) STATEMENT 24
38 39 stage/sql/Commit (stage) STATEMENT 24
39 39 wait/synch/mutex/sql/THD::LOCK_thd_kill lock STAGE 38
40 40 stage/sql/closing tables (stage) STATEMENT 24
37 38 stage/sql/Query end (stage) STATEMENT 24
38 38 wait/synch/mutex/sql/THD::LOCK_thd_kill lock STAGE 37
39 39 stage/sql/closing tables (stage) STATEMENT 24
40 40 stage/sql/Query end (stage) STATEMENT 24
41 41 stage/sql/Starting cleanup (stage) STATEMENT 24
42 42 stage/sql/Freeing items (stage) STATEMENT 24
43 43 wait/io/socket/sql/client_connection send STATEMENT 24
@ -175,10 +175,10 @@ relative_event_id relative_end_event_id event_name comment nesting_event_type re
58 58 stage/sql/Optimizing (stage) STATEMENT 48
59 59 stage/sql/Executing (stage) STATEMENT 48
60 60 stage/sql/End of update loop (stage) STATEMENT 48
61 61 stage/sql/Query end (stage) STATEMENT 48
62 63 stage/sql/Commit (stage) STATEMENT 48
63 63 wait/synch/mutex/sql/THD::LOCK_thd_kill lock STAGE 62
64 64 stage/sql/closing tables (stage) STATEMENT 48
61 62 stage/sql/Query end (stage) STATEMENT 48
62 62 wait/synch/mutex/sql/THD::LOCK_thd_kill lock STAGE 61
63 63 stage/sql/closing tables (stage) STATEMENT 48
64 64 stage/sql/Query end (stage) STATEMENT 48
65 65 stage/sql/Starting cleanup (stage) STATEMENT 48
66 66 stage/sql/Freeing items (stage) STATEMENT 48
67 67 wait/io/socket/sql/client_connection send STATEMENT 48
@ -202,10 +202,10 @@ select "With a third part to make things complete" as payload NULL NULL
83 83 stage/sql/Optimizing (stage) STATEMENT 72
84 84 stage/sql/Executing (stage) STATEMENT 72
85 85 stage/sql/End of update loop (stage) STATEMENT 72
86 86 stage/sql/Query end (stage) STATEMENT 72
87 88 stage/sql/Commit (stage) STATEMENT 72
88 88 wait/synch/mutex/sql/THD::LOCK_thd_kill lock STAGE 87
89 89 stage/sql/closing tables (stage) STATEMENT 72
86 87 stage/sql/Query end (stage) STATEMENT 72
87 87 wait/synch/mutex/sql/THD::LOCK_thd_kill lock STAGE 86
88 88 stage/sql/closing tables (stage) STATEMENT 72
89 89 stage/sql/Query end (stage) STATEMENT 72
90 90 stage/sql/Starting cleanup (stage) STATEMENT 72
91 92 stage/sql/Freeing items (stage) STATEMENT 72
92 92 wait/io/socket/sql/client_connection send STAGE 91
@ -221,10 +221,10 @@ select "With a third part to make things complete" as payload NULL NULL
101 101 stage/sql/Optimizing (stage) STATEMENT 93
102 102 stage/sql/Executing (stage) STATEMENT 93
103 103 stage/sql/End of update loop (stage) STATEMENT 93
104 104 stage/sql/Query end (stage) STATEMENT 93
105 106 stage/sql/Commit (stage) STATEMENT 93
106 106 wait/synch/mutex/sql/THD::LOCK_thd_kill lock STAGE 105
107 107 stage/sql/closing tables (stage) STATEMENT 93
104 105 stage/sql/Query end (stage) STATEMENT 93
105 105 wait/synch/mutex/sql/THD::LOCK_thd_kill lock STAGE 104
106 106 stage/sql/closing tables (stage) STATEMENT 93
107 107 stage/sql/Query end (stage) STATEMENT 93
108 108 stage/sql/Starting cleanup (stage) STATEMENT 93
109 110 stage/sql/Freeing items (stage) STATEMENT 93
110 110 wait/io/socket/sql/client_connection send STAGE 109
@ -238,10 +238,10 @@ select "With a third part to make things complete" as payload NULL NULL
118 118 stage/sql/Optimizing (stage) STATEMENT 111
119 119 stage/sql/Executing (stage) STATEMENT 111
120 120 stage/sql/End of update loop (stage) STATEMENT 111
121 121 stage/sql/Query end (stage) STATEMENT 111
122 123 stage/sql/Commit (stage) STATEMENT 111
123 123 wait/synch/mutex/sql/THD::LOCK_thd_kill lock STAGE 122
124 124 stage/sql/closing tables (stage) STATEMENT 111
121 122 stage/sql/Query end (stage) STATEMENT 111
122 122 wait/synch/mutex/sql/THD::LOCK_thd_kill lock STAGE 121
123 123 stage/sql/closing tables (stage) STATEMENT 111
124 124 stage/sql/Query end (stage) STATEMENT 111
125 125 stage/sql/Starting cleanup (stage) STATEMENT 111
126 126 stage/sql/Freeing items (stage) STATEMENT 111
127 127 wait/io/socket/sql/client_connection send STATEMENT 111
@ -262,10 +262,10 @@ select "With a third part to make things complete" as payload NULL NULL
142 142 stage/sql/Optimizing (stage) STATEMENT 132
143 143 stage/sql/Executing (stage) STATEMENT 132
144 144 stage/sql/End of update loop (stage) STATEMENT 132
145 145 stage/sql/Query end (stage) STATEMENT 132
146 147 stage/sql/Commit (stage) STATEMENT 132
147 147 wait/synch/mutex/sql/THD::LOCK_thd_kill lock STAGE 146
148 148 stage/sql/closing tables (stage) STATEMENT 132
145 146 stage/sql/Query end (stage) STATEMENT 132
146 146 wait/synch/mutex/sql/THD::LOCK_thd_kill lock STAGE 145
147 147 stage/sql/closing tables (stage) STATEMENT 132
148 148 stage/sql/Query end (stage) STATEMENT 132
149 149 stage/sql/Starting cleanup (stage) STATEMENT 132
150 150 stage/sql/Freeing items (stage) STATEMENT 132
151 151 wait/io/socket/sql/client_connection send STATEMENT 132