- developers - lists.mariadb.org

[Maria-developers] Updated (by Knielsen): mysqlbinlog: remove undesired effects of format description binlog statement (50)
by worklog-noreply＠askmonty.org 29 Sep '09

29 Sep '09

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: mysqlbinlog: remove undesired effects of format description binlog statement CREATION DATE..: Mon, 17 Aug 2009, 14:12 SUPERVISOR.....: Monty IMPLEMENTOR....: Knielsen COPIES TO......: CATEGORY.......: Server-Sprint TASK ID........: 50 (http://askmonty.org/worklog/?tid=50) VERSION........: Server-9.x STATUS.........: Code-Review PRIORITY.......: 60 WORKED HOURS...: 14 ESTIMATE.......: 6 (hours remain) ORIG. ESTIMATE.: 10 PROGRESS NOTES: -=-=(Knielsen - Tue, 29 Sep 2009, 10:12)=-=- Category updated. --- /tmp/wklog.50.old.3293 2009-09-29 10:12:26.000000000 +0300 +++ /tmp/wklog.50.new.3293 2009-09-29 10:12:26.000000000 +0300 @@ -1 +1 @@ -Server-RawIdeaBin +Server-Sprint -=-=(Knielsen - Tue, 29 Sep 2009, 10:12)=-=- Status updated. --- /tmp/wklog.50.old.3293 2009-09-29 10:12:26.000000000 +0300 +++ /tmp/wklog.50.new.3293 2009-09-29 10:12:26.000000000 +0300 @@ -1 +1 @@ -Un-Assigned +Code-Review -=-=(Knielsen - Mon, 28 Sep 2009, 16:00)=-=- Updated patch against MySQL 5.1.39 Fixes a couple of issues with the patch. Discussions with MySQL developer. Worked 4 hours and estimate 6 hours remain (original estimate unchanged). -=-=(Knielsen - Wed, 09 Sep 2009, 18:31)=-=- Discussed with MySQL developers on Bug#46640. Committed a suggested fix: https://lists.launchpad.net/maria-developers/msg00926.html Worked 8 hours and estimate 10 hours remain (original estimate increased by 18 hours). -=-=(Guest - Wed, 09 Sep 2009, 11:50)=-=- High Level Description modified. --- /tmp/wklog.50.old.11584 2009-09-09 11:50:12.000000000 +0300 +++ /tmp/wklog.50.new.11584 2009-09-09 11:50:12.000000000 +0300 @@ -5,7 +5,11 @@ This will cause an error when one tires to apply mysqlbinlog output to a 5.0.x server. -2. When one applies "format description binlog statement" at the slave, it -will change the slave's server_id when applied. +2. When one executes a BINLOG statement (containing "format description binlog +statement" or other events), this will cause subsequent statements run in +the same session to be binlogged with the server id of the last event +executed, not with the real server id. This can cause problems like infinite +recursive application in a circular replication topology. This WL is to fix these issues. + -=-=(Knielsen - Tue, 08 Sep 2009, 15:07)=-=- Low Level Design modified. --- /tmp/wklog.50.old.19208 2009-09-08 15:07:09.000000000 +0300 +++ /tmp/wklog.50.new.19208 2009-09-08 15:07:09.000000000 +0300 @@ -1 +1,34 @@ +I think the fix for point 2 is to replace the call to +apply_event_and_update_pos() in mysql_client_binlog_statement() with a direct +call to ev->apply_event(). However, I need to check two things to be sure this +is correct: + +1. The existing code does + + if (!ev->when) ev->when= my_time(0) + +Need to understand if this is needed/correct or not. + +2. The existing code does ev->update_pos(). I think this is redundant for +BINLOG statement (as it uses a fake rli structure), but I need to check to +make sure. + +Once this is done, point 1 may no longer be needed. The user can use +--base64-output=never when applying the output to a 5.0 server, and omit that +option when applying the output to a 5.1 server. There should be no need to +omit the format description event in the output when other BINLOG statements +for row events are present, as it no longer changes the server id. In fact the +format description event is required to be able to execute other BINLOG +statements, as its purpose is to define the binary format of the events +contained in these statements. + +Alternatively, we could implement that if the format description event of the +source binlog has server version < 5.1, and --base64-output=auto (default), +then the format description event is omitted (and should any BINLOG statement +be needed, unlikely as it is from a 5.0 server, we will need to throw an +error). + +The binlog format version for 5.0 and 5.1 is actually the same, hence the need +to look at server version to guess if the format description event can be +omitted. -=-=(Knielsen - Tue, 08 Sep 2009, 14:29)=-=- High-Level Specification modified. --- /tmp/wklog.50.old.17531 2009-09-08 14:29:30.000000000 +0300 +++ /tmp/wklog.50.new.17531 2009-09-08 14:29:30.000000000 +0300 @@ -12,3 +12,37 @@ One question that one needs to sort out before disabling server_id change is why it was put there in the first place? Should it be always removed? +First, the problem is not the format description log event. In fact all log +events have their own value of server_id, and every event in the BINLOG +statement is executed with its own id as server_id. + +It seems it was introduced deliberately in the patch for Bug#32407. This patch +makes sql thread and BINLOG statement share code path for executing the binary +event, even though the bug is really about something different (outputting +format description event to allow proper execution of other BINLOG +statements). + +Nevertheless, I think using the server_id in the events of a BINLOG statement +is wrong: + +1. It is different behaviour from executing normal statement-based events not +written using BINLOG. + +2. It causes the possibility for infinite cycle of replication in a cyclic +replication setup, if the server ids in BINLOG are different from all other +server ids in the cycle. + +3. The functionality of applying events with original server id from the event +is still available by pointing the slave thread to the binlog. The +functionality of applying row-based binlog events with server id of the server +executing the BINLOG statements is not otherwise available. + +In fact most of the code from the slave thread that is now also run when +executing BINLOG statements is redundant, or does the wrong thing (like +updating binlog position). + +Maybe there is a confusion on the purpose of the BINLOG statement. Is it to be +able to apply row-based events manually to a server (mysqlbinlog|mysql)? Or is +it to be able to simulate the effect of the slave sql thread? I think the +former is the most important one. + -=-=(Knielsen - Mon, 07 Sep 2009, 10:06)=-=- Research worklog, bugs, and existing server code. Worked 2 hours and estimate 0 hours remain (original estimate increased by 2 hours). -=-=(Psergey - Mon, 17 Aug 2009, 14:13)=-=- Dependency created: 39 now depends on 50 -=-=(Psergey - Mon, 17 Aug 2009, 14:13)=-=- High-Level Specification modified. --- /tmp/wklog.50.old.11389 2009-08-17 14:13:05.000000000 +0300 +++ /tmp/wklog.50.new.11389 2009-08-17 14:13:05.000000000 +0300 @@ -1 +1,14 @@ +First item +---------- +AFAIU what needs to be done is: +1. record a source server version (it is in the first binlog event). +2. don't emit a BINLOG statement if the recorded version number is 5.0.x or + below. + +and we'll get a 5.0-applicable binlog. + +Second item +----------- +One question that one needs to sort out before disabling server_id change is +why it was put there in the first place? Should it be always removed? DESCRIPTION: According to complaints in BUG#46640: 1. mysqlbinlog will emit a 5.0-incompatible "format description binlog statement" even when reading a binary log that was produced by 5.0. This will cause an error when one tires to apply mysqlbinlog output to a 5.0.x server. 2. When one executes a BINLOG statement (containing "format description binlog statement" or other events), this will cause subsequent statements run in the same session to be binlogged with the server id of the last event executed, not with the real server id. This can cause problems like infinite recursive application in a circular replication topology. This WL is to fix these issues. HIGH-LEVEL SPECIFICATION: First item ---------- AFAIU what needs to be done is: 1. record a source server version (it is in the first binlog event). 2. don't emit a BINLOG statement if the recorded version number is 5.0.x or below. and we'll get a 5.0-applicable binlog. Second item ----------- One question that one needs to sort out before disabling server_id change is why it was put there in the first place? Should it be always removed? First, the problem is not the format description log event. In fact all log events have their own value of server_id, and every event in the BINLOG statement is executed with its own id as server_id. It seems it was introduced deliberately in the patch for Bug#32407. This patch makes sql thread and BINLOG statement share code path for executing the binary event, even though the bug is really about something different (outputting format description event to allow proper execution of other BINLOG statements). Nevertheless, I think using the server_id in the events of a BINLOG statement is wrong: 1. It is different behaviour from executing normal statement-based events not written using BINLOG. 2. It causes the possibility for infinite cycle of replication in a cyclic replication setup, if the server ids in BINLOG are different from all other server ids in the cycle. 3. The functionality of applying events with original server id from the event is still available by pointing the slave thread to the binlog. The functionality of applying row-based binlog events with server id of the server executing the BINLOG statements is not otherwise available. In fact most of the code from the slave thread that is now also run when executing BINLOG statements is redundant, or does the wrong thing (like updating binlog position). Maybe there is a confusion on the purpose of the BINLOG statement. Is it to be able to apply row-based events manually to a server (mysqlbinlog|mysql)? Or is it to be able to simulate the effect of the slave sql thread? I think the former is the most important one. LOW-LEVEL DESIGN: I think the fix for point 2 is to replace the call to apply_event_and_update_pos() in mysql_client_binlog_statement() with a direct call to ev->apply_event(). However, I need to check two things to be sure this is correct: 1. The existing code does if (!ev->when) ev->when= my_time(0) Need to understand if this is needed/correct or not. 2. The existing code does ev->update_pos(). I think this is redundant for BINLOG statement (as it uses a fake rli structure), but I need to check to make sure. Once this is done, point 1 may no longer be needed. The user can use --base64-output=never when applying the output to a 5.0 server, and omit that option when applying the output to a 5.1 server. There should be no need to omit the format description event in the output when other BINLOG statements for row events are present, as it no longer changes the server id. In fact the format description event is required to be able to execute other BINLOG statements, as its purpose is to define the binary format of the events contained in these statements. Alternatively, we could implement that if the format description event of the source binlog has server version < 5.1, and --base64-output=auto (default), then the format description event is omitted (and should any BINLOG statement be needed, unlikely as it is from a 5.0 server, we will need to throw an error). The binlog format version for 5.0 and 5.1 is actually the same, hence the need to look at server version to guess if the format description event can be omitted. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] Updated (by Knielsen): mysqlbinlog: remove undesired effects of format description binlog statement (50)
by worklog-noreply＠askmonty.org 29 Sep '09

29 Sep '09

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: mysqlbinlog: remove undesired effects of format description binlog statement CREATION DATE..: Mon, 17 Aug 2009, 14:12 SUPERVISOR.....: Monty IMPLEMENTOR....: Knielsen COPIES TO......: CATEGORY.......: Server-Sprint TASK ID........: 50 (http://askmonty.org/worklog/?tid=50) VERSION........: Server-9.x STATUS.........: Code-Review PRIORITY.......: 60 WORKED HOURS...: 14 ESTIMATE.......: 6 (hours remain) ORIG. ESTIMATE.: 10 PROGRESS NOTES: -=-=(Knielsen - Tue, 29 Sep 2009, 10:12)=-=- Category updated. --- /tmp/wklog.50.old.3293 2009-09-29 10:12:26.000000000 +0300 +++ /tmp/wklog.50.new.3293 2009-09-29 10:12:26.000000000 +0300 @@ -1 +1 @@ -Server-RawIdeaBin +Server-Sprint -=-=(Knielsen - Tue, 29 Sep 2009, 10:12)=-=- Status updated. --- /tmp/wklog.50.old.3293 2009-09-29 10:12:26.000000000 +0300 +++ /tmp/wklog.50.new.3293 2009-09-29 10:12:26.000000000 +0300 @@ -1 +1 @@ -Un-Assigned +Code-Review -=-=(Knielsen - Mon, 28 Sep 2009, 16:00)=-=- Updated patch against MySQL 5.1.39 Fixes a couple of issues with the patch. Discussions with MySQL developer. Worked 4 hours and estimate 6 hours remain (original estimate unchanged). -=-=(Knielsen - Wed, 09 Sep 2009, 18:31)=-=- Discussed with MySQL developers on Bug#46640. Committed a suggested fix: https://lists.launchpad.net/maria-developers/msg00926.html Worked 8 hours and estimate 10 hours remain (original estimate increased by 18 hours). -=-=(Guest - Wed, 09 Sep 2009, 11:50)=-=- High Level Description modified. --- /tmp/wklog.50.old.11584 2009-09-09 11:50:12.000000000 +0300 +++ /tmp/wklog.50.new.11584 2009-09-09 11:50:12.000000000 +0300 @@ -5,7 +5,11 @@ This will cause an error when one tires to apply mysqlbinlog output to a 5.0.x server. -2. When one applies "format description binlog statement" at the slave, it -will change the slave's server_id when applied. +2. When one executes a BINLOG statement (containing "format description binlog +statement" or other events), this will cause subsequent statements run in +the same session to be binlogged with the server id of the last event +executed, not with the real server id. This can cause problems like infinite +recursive application in a circular replication topology. This WL is to fix these issues. + -=-=(Knielsen - Tue, 08 Sep 2009, 15:07)=-=- Low Level Design modified. --- /tmp/wklog.50.old.19208 2009-09-08 15:07:09.000000000 +0300 +++ /tmp/wklog.50.new.19208 2009-09-08 15:07:09.000000000 +0300 @@ -1 +1,34 @@ +I think the fix for point 2 is to replace the call to +apply_event_and_update_pos() in mysql_client_binlog_statement() with a direct +call to ev->apply_event(). However, I need to check two things to be sure this +is correct: + +1. The existing code does + + if (!ev->when) ev->when= my_time(0) + +Need to understand if this is needed/correct or not. + +2. The existing code does ev->update_pos(). I think this is redundant for +BINLOG statement (as it uses a fake rli structure), but I need to check to +make sure. + +Once this is done, point 1 may no longer be needed. The user can use +--base64-output=never when applying the output to a 5.0 server, and omit that +option when applying the output to a 5.1 server. There should be no need to +omit the format description event in the output when other BINLOG statements +for row events are present, as it no longer changes the server id. In fact the +format description event is required to be able to execute other BINLOG +statements, as its purpose is to define the binary format of the events +contained in these statements. + +Alternatively, we could implement that if the format description event of the +source binlog has server version < 5.1, and --base64-output=auto (default), +then the format description event is omitted (and should any BINLOG statement +be needed, unlikely as it is from a 5.0 server, we will need to throw an +error). + +The binlog format version for 5.0 and 5.1 is actually the same, hence the need +to look at server version to guess if the format description event can be +omitted. -=-=(Knielsen - Tue, 08 Sep 2009, 14:29)=-=- High-Level Specification modified. --- /tmp/wklog.50.old.17531 2009-09-08 14:29:30.000000000 +0300 +++ /tmp/wklog.50.new.17531 2009-09-08 14:29:30.000000000 +0300 @@ -12,3 +12,37 @@ One question that one needs to sort out before disabling server_id change is why it was put there in the first place? Should it be always removed? +First, the problem is not the format description log event. In fact all log +events have their own value of server_id, and every event in the BINLOG +statement is executed with its own id as server_id. + +It seems it was introduced deliberately in the patch for Bug#32407. This patch +makes sql thread and BINLOG statement share code path for executing the binary +event, even though the bug is really about something different (outputting +format description event to allow proper execution of other BINLOG +statements). + +Nevertheless, I think using the server_id in the events of a BINLOG statement +is wrong: + +1. It is different behaviour from executing normal statement-based events not +written using BINLOG. + +2. It causes the possibility for infinite cycle of replication in a cyclic +replication setup, if the server ids in BINLOG are different from all other +server ids in the cycle. + +3. The functionality of applying events with original server id from the event +is still available by pointing the slave thread to the binlog. The +functionality of applying row-based binlog events with server id of the server +executing the BINLOG statements is not otherwise available. + +In fact most of the code from the slave thread that is now also run when +executing BINLOG statements is redundant, or does the wrong thing (like +updating binlog position). + +Maybe there is a confusion on the purpose of the BINLOG statement. Is it to be +able to apply row-based events manually to a server (mysqlbinlog|mysql)? Or is +it to be able to simulate the effect of the slave sql thread? I think the +former is the most important one. + -=-=(Knielsen - Mon, 07 Sep 2009, 10:06)=-=- Research worklog, bugs, and existing server code. Worked 2 hours and estimate 0 hours remain (original estimate increased by 2 hours). -=-=(Psergey - Mon, 17 Aug 2009, 14:13)=-=- Dependency created: 39 now depends on 50 -=-=(Psergey - Mon, 17 Aug 2009, 14:13)=-=- High-Level Specification modified. --- /tmp/wklog.50.old.11389 2009-08-17 14:13:05.000000000 +0300 +++ /tmp/wklog.50.new.11389 2009-08-17 14:13:05.000000000 +0300 @@ -1 +1,14 @@ +First item +---------- +AFAIU what needs to be done is: +1. record a source server version (it is in the first binlog event). +2. don't emit a BINLOG statement if the recorded version number is 5.0.x or + below. + +and we'll get a 5.0-applicable binlog. + +Second item +----------- +One question that one needs to sort out before disabling server_id change is +why it was put there in the first place? Should it be always removed? DESCRIPTION: According to complaints in BUG#46640: 1. mysqlbinlog will emit a 5.0-incompatible "format description binlog statement" even when reading a binary log that was produced by 5.0. This will cause an error when one tires to apply mysqlbinlog output to a 5.0.x server. 2. When one executes a BINLOG statement (containing "format description binlog statement" or other events), this will cause subsequent statements run in the same session to be binlogged with the server id of the last event executed, not with the real server id. This can cause problems like infinite recursive application in a circular replication topology. This WL is to fix these issues. HIGH-LEVEL SPECIFICATION: First item ---------- AFAIU what needs to be done is: 1. record a source server version (it is in the first binlog event). 2. don't emit a BINLOG statement if the recorded version number is 5.0.x or below. and we'll get a 5.0-applicable binlog. Second item ----------- One question that one needs to sort out before disabling server_id change is why it was put there in the first place? Should it be always removed? First, the problem is not the format description log event. In fact all log events have their own value of server_id, and every event in the BINLOG statement is executed with its own id as server_id. It seems it was introduced deliberately in the patch for Bug#32407. This patch makes sql thread and BINLOG statement share code path for executing the binary event, even though the bug is really about something different (outputting format description event to allow proper execution of other BINLOG statements). Nevertheless, I think using the server_id in the events of a BINLOG statement is wrong: 1. It is different behaviour from executing normal statement-based events not written using BINLOG. 2. It causes the possibility for infinite cycle of replication in a cyclic replication setup, if the server ids in BINLOG are different from all other server ids in the cycle. 3. The functionality of applying events with original server id from the event is still available by pointing the slave thread to the binlog. The functionality of applying row-based binlog events with server id of the server executing the BINLOG statements is not otherwise available. In fact most of the code from the slave thread that is now also run when executing BINLOG statements is redundant, or does the wrong thing (like updating binlog position). Maybe there is a confusion on the purpose of the BINLOG statement. Is it to be able to apply row-based events manually to a server (mysqlbinlog|mysql)? Or is it to be able to simulate the effect of the slave sql thread? I think the former is the most important one. LOW-LEVEL DESIGN: I think the fix for point 2 is to replace the call to apply_event_and_update_pos() in mysql_client_binlog_statement() with a direct call to ev->apply_event(). However, I need to check two things to be sure this is correct: 1. The existing code does if (!ev->when) ev->when= my_time(0) Need to understand if this is needed/correct or not. 2. The existing code does ev->update_pos(). I think this is redundant for BINLOG statement (as it uses a fake rli structure), but I need to check to make sure. Once this is done, point 1 may no longer be needed. The user can use --base64-output=never when applying the output to a 5.0 server, and omit that option when applying the output to a 5.1 server. There should be no need to omit the format description event in the output when other BINLOG statements for row events are present, as it no longer changes the server id. In fact the format description event is required to be able to execute other BINLOG statements, as its purpose is to define the binary format of the events contained in these statements. Alternatively, we could implement that if the format description event of the source binlog has server version < 5.1, and --base64-output=auto (default), then the format description event is omitted (and should any BINLOG statement be needed, unlikely as it is from a 5.0 server, we will need to throw an error). The binlog format version for 5.0 and 5.1 is actually the same, hence the need to look at server version to guess if the format description event can be omitted. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] Progress (by Knielsen): mysqlbinlog: remove undesired effects of format description binlog statement (50)
by worklog-noreply＠askmonty.org 28 Sep '09

28 Sep '09

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: mysqlbinlog: remove undesired effects of format description binlog statement CREATION DATE..: Mon, 17 Aug 2009, 14:12 SUPERVISOR.....: Monty IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Server-RawIdeaBin TASK ID........: 50 (http://askmonty.org/worklog/?tid=50) VERSION........: Server-9.x STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 14 ESTIMATE.......: 6 (hours remain) ORIG. ESTIMATE.: 10 PROGRESS NOTES: -=-=(Knielsen - Mon, 28 Sep 2009, 16:00)=-=- Updated patch against MySQL 5.1.39 Fixes a couple of issues with the patch. Discussions with MySQL developer. Worked 4 hours and estimate 6 hours remain (original estimate unchanged). -=-=(Knielsen - Wed, 09 Sep 2009, 18:31)=-=- Discussed with MySQL developers on Bug#46640. Committed a suggested fix: https://lists.launchpad.net/maria-developers/msg00926.html Worked 8 hours and estimate 10 hours remain (original estimate increased by 18 hours). -=-=(Guest - Wed, 09 Sep 2009, 11:50)=-=- High Level Description modified. --- /tmp/wklog.50.old.11584 2009-09-09 11:50:12.000000000 +0300 +++ /tmp/wklog.50.new.11584 2009-09-09 11:50:12.000000000 +0300 @@ -5,7 +5,11 @@ This will cause an error when one tires to apply mysqlbinlog output to a 5.0.x server. -2. When one applies "format description binlog statement" at the slave, it -will change the slave's server_id when applied. +2. When one executes a BINLOG statement (containing "format description binlog +statement" or other events), this will cause subsequent statements run in +the same session to be binlogged with the server id of the last event +executed, not with the real server id. This can cause problems like infinite +recursive application in a circular replication topology. This WL is to fix these issues. + -=-=(Knielsen - Tue, 08 Sep 2009, 15:07)=-=- Low Level Design modified. --- /tmp/wklog.50.old.19208 2009-09-08 15:07:09.000000000 +0300 +++ /tmp/wklog.50.new.19208 2009-09-08 15:07:09.000000000 +0300 @@ -1 +1,34 @@ +I think the fix for point 2 is to replace the call to +apply_event_and_update_pos() in mysql_client_binlog_statement() with a direct +call to ev->apply_event(). However, I need to check two things to be sure this +is correct: + +1. The existing code does + + if (!ev->when) ev->when= my_time(0) + +Need to understand if this is needed/correct or not. + +2. The existing code does ev->update_pos(). I think this is redundant for +BINLOG statement (as it uses a fake rli structure), but I need to check to +make sure. + +Once this is done, point 1 may no longer be needed. The user can use +--base64-output=never when applying the output to a 5.0 server, and omit that +option when applying the output to a 5.1 server. There should be no need to +omit the format description event in the output when other BINLOG statements +for row events are present, as it no longer changes the server id. In fact the +format description event is required to be able to execute other BINLOG +statements, as its purpose is to define the binary format of the events +contained in these statements. + +Alternatively, we could implement that if the format description event of the +source binlog has server version < 5.1, and --base64-output=auto (default), +then the format description event is omitted (and should any BINLOG statement +be needed, unlikely as it is from a 5.0 server, we will need to throw an +error). + +The binlog format version for 5.0 and 5.1 is actually the same, hence the need +to look at server version to guess if the format description event can be +omitted. -=-=(Knielsen - Tue, 08 Sep 2009, 14:29)=-=- High-Level Specification modified. --- /tmp/wklog.50.old.17531 2009-09-08 14:29:30.000000000 +0300 +++ /tmp/wklog.50.new.17531 2009-09-08 14:29:30.000000000 +0300 @@ -12,3 +12,37 @@ One question that one needs to sort out before disabling server_id change is why it was put there in the first place? Should it be always removed? +First, the problem is not the format description log event. In fact all log +events have their own value of server_id, and every event in the BINLOG +statement is executed with its own id as server_id. + +It seems it was introduced deliberately in the patch for Bug#32407. This patch +makes sql thread and BINLOG statement share code path for executing the binary +event, even though the bug is really about something different (outputting +format description event to allow proper execution of other BINLOG +statements). + +Nevertheless, I think using the server_id in the events of a BINLOG statement +is wrong: + +1. It is different behaviour from executing normal statement-based events not +written using BINLOG. + +2. It causes the possibility for infinite cycle of replication in a cyclic +replication setup, if the server ids in BINLOG are different from all other +server ids in the cycle. + +3. The functionality of applying events with original server id from the event +is still available by pointing the slave thread to the binlog. The +functionality of applying row-based binlog events with server id of the server +executing the BINLOG statements is not otherwise available. + +In fact most of the code from the slave thread that is now also run when +executing BINLOG statements is redundant, or does the wrong thing (like +updating binlog position). + +Maybe there is a confusion on the purpose of the BINLOG statement. Is it to be +able to apply row-based events manually to a server (mysqlbinlog|mysql)? Or is +it to be able to simulate the effect of the slave sql thread? I think the +former is the most important one. + -=-=(Knielsen - Mon, 07 Sep 2009, 10:06)=-=- Research worklog, bugs, and existing server code. Worked 2 hours and estimate 0 hours remain (original estimate increased by 2 hours). -=-=(Psergey - Mon, 17 Aug 2009, 14:13)=-=- Dependency created: 39 now depends on 50 -=-=(Psergey - Mon, 17 Aug 2009, 14:13)=-=- High-Level Specification modified. --- /tmp/wklog.50.old.11389 2009-08-17 14:13:05.000000000 +0300 +++ /tmp/wklog.50.new.11389 2009-08-17 14:13:05.000000000 +0300 @@ -1 +1,14 @@ +First item +---------- +AFAIU what needs to be done is: +1. record a source server version (it is in the first binlog event). +2. don't emit a BINLOG statement if the recorded version number is 5.0.x or + below. + +and we'll get a 5.0-applicable binlog. + +Second item +----------- +One question that one needs to sort out before disabling server_id change is +why it was put there in the first place? Should it be always removed? DESCRIPTION: According to complaints in BUG#46640: 1. mysqlbinlog will emit a 5.0-incompatible "format description binlog statement" even when reading a binary log that was produced by 5.0. This will cause an error when one tires to apply mysqlbinlog output to a 5.0.x server. 2. When one executes a BINLOG statement (containing "format description binlog statement" or other events), this will cause subsequent statements run in the same session to be binlogged with the server id of the last event executed, not with the real server id. This can cause problems like infinite recursive application in a circular replication topology. This WL is to fix these issues. HIGH-LEVEL SPECIFICATION: First item ---------- AFAIU what needs to be done is: 1. record a source server version (it is in the first binlog event). 2. don't emit a BINLOG statement if the recorded version number is 5.0.x or below. and we'll get a 5.0-applicable binlog. Second item ----------- One question that one needs to sort out before disabling server_id change is why it was put there in the first place? Should it be always removed? First, the problem is not the format description log event. In fact all log events have their own value of server_id, and every event in the BINLOG statement is executed with its own id as server_id. It seems it was introduced deliberately in the patch for Bug#32407. This patch makes sql thread and BINLOG statement share code path for executing the binary event, even though the bug is really about something different (outputting format description event to allow proper execution of other BINLOG statements). Nevertheless, I think using the server_id in the events of a BINLOG statement is wrong: 1. It is different behaviour from executing normal statement-based events not written using BINLOG. 2. It causes the possibility for infinite cycle of replication in a cyclic replication setup, if the server ids in BINLOG are different from all other server ids in the cycle. 3. The functionality of applying events with original server id from the event is still available by pointing the slave thread to the binlog. The functionality of applying row-based binlog events with server id of the server executing the BINLOG statements is not otherwise available. In fact most of the code from the slave thread that is now also run when executing BINLOG statements is redundant, or does the wrong thing (like updating binlog position). Maybe there is a confusion on the purpose of the BINLOG statement. Is it to be able to apply row-based events manually to a server (mysqlbinlog|mysql)? Or is it to be able to simulate the effect of the slave sql thread? I think the former is the most important one. LOW-LEVEL DESIGN: I think the fix for point 2 is to replace the call to apply_event_and_update_pos() in mysql_client_binlog_statement() with a direct call to ev->apply_event(). However, I need to check two things to be sure this is correct: 1. The existing code does if (!ev->when) ev->when= my_time(0) Need to understand if this is needed/correct or not. 2. The existing code does ev->update_pos(). I think this is redundant for BINLOG statement (as it uses a fake rli structure), but I need to check to make sure. Once this is done, point 1 may no longer be needed. The user can use --base64-output=never when applying the output to a 5.0 server, and omit that option when applying the output to a 5.1 server. There should be no need to omit the format description event in the output when other BINLOG statements for row events are present, as it no longer changes the server id. In fact the format description event is required to be able to execute other BINLOG statements, as its purpose is to define the binary format of the events contained in these statements. Alternatively, we could implement that if the format description event of the source binlog has server version < 5.1, and --base64-output=auto (default), then the format description event is omitted (and should any BINLOG statement be needed, unlikely as it is from a 5.0 server, we will need to throw an error). The binlog format version for 5.0 and 5.1 is actually the same, hence the need to look at server version to guess if the format description event can be omitted. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] Progress (by Knielsen): mysqlbinlog: remove undesired effects of format description binlog statement (50)
by worklog-noreply＠askmonty.org 28 Sep '09

28 Sep '09

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: mysqlbinlog: remove undesired effects of format description binlog statement CREATION DATE..: Mon, 17 Aug 2009, 14:12 SUPERVISOR.....: Monty IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Server-RawIdeaBin TASK ID........: 50 (http://askmonty.org/worklog/?tid=50) VERSION........: Server-9.x STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 14 ESTIMATE.......: 6 (hours remain) ORIG. ESTIMATE.: 10 PROGRESS NOTES: -=-=(Knielsen - Mon, 28 Sep 2009, 16:00)=-=- Updated patch against MySQL 5.1.39 Fixes a couple of issues with the patch. Discussions with MySQL developer. Worked 4 hours and estimate 6 hours remain (original estimate unchanged). -=-=(Knielsen - Wed, 09 Sep 2009, 18:31)=-=- Discussed with MySQL developers on Bug#46640. Committed a suggested fix: https://lists.launchpad.net/maria-developers/msg00926.html Worked 8 hours and estimate 10 hours remain (original estimate increased by 18 hours). -=-=(Guest - Wed, 09 Sep 2009, 11:50)=-=- High Level Description modified. --- /tmp/wklog.50.old.11584 2009-09-09 11:50:12.000000000 +0300 +++ /tmp/wklog.50.new.11584 2009-09-09 11:50:12.000000000 +0300 @@ -5,7 +5,11 @@ This will cause an error when one tires to apply mysqlbinlog output to a 5.0.x server. -2. When one applies "format description binlog statement" at the slave, it -will change the slave's server_id when applied. +2. When one executes a BINLOG statement (containing "format description binlog +statement" or other events), this will cause subsequent statements run in +the same session to be binlogged with the server id of the last event +executed, not with the real server id. This can cause problems like infinite +recursive application in a circular replication topology. This WL is to fix these issues. + -=-=(Knielsen - Tue, 08 Sep 2009, 15:07)=-=- Low Level Design modified. --- /tmp/wklog.50.old.19208 2009-09-08 15:07:09.000000000 +0300 +++ /tmp/wklog.50.new.19208 2009-09-08 15:07:09.000000000 +0300 @@ -1 +1,34 @@ +I think the fix for point 2 is to replace the call to +apply_event_and_update_pos() in mysql_client_binlog_statement() with a direct +call to ev->apply_event(). However, I need to check two things to be sure this +is correct: + +1. The existing code does + + if (!ev->when) ev->when= my_time(0) + +Need to understand if this is needed/correct or not. + +2. The existing code does ev->update_pos(). I think this is redundant for +BINLOG statement (as it uses a fake rli structure), but I need to check to +make sure. + +Once this is done, point 1 may no longer be needed. The user can use +--base64-output=never when applying the output to a 5.0 server, and omit that +option when applying the output to a 5.1 server. There should be no need to +omit the format description event in the output when other BINLOG statements +for row events are present, as it no longer changes the server id. In fact the +format description event is required to be able to execute other BINLOG +statements, as its purpose is to define the binary format of the events +contained in these statements. + +Alternatively, we could implement that if the format description event of the +source binlog has server version < 5.1, and --base64-output=auto (default), +then the format description event is omitted (and should any BINLOG statement +be needed, unlikely as it is from a 5.0 server, we will need to throw an +error). + +The binlog format version for 5.0 and 5.1 is actually the same, hence the need +to look at server version to guess if the format description event can be +omitted. -=-=(Knielsen - Tue, 08 Sep 2009, 14:29)=-=- High-Level Specification modified. --- /tmp/wklog.50.old.17531 2009-09-08 14:29:30.000000000 +0300 +++ /tmp/wklog.50.new.17531 2009-09-08 14:29:30.000000000 +0300 @@ -12,3 +12,37 @@ One question that one needs to sort out before disabling server_id change is why it was put there in the first place? Should it be always removed? +First, the problem is not the format description log event. In fact all log +events have their own value of server_id, and every event in the BINLOG +statement is executed with its own id as server_id. + +It seems it was introduced deliberately in the patch for Bug#32407. This patch +makes sql thread and BINLOG statement share code path for executing the binary +event, even though the bug is really about something different (outputting +format description event to allow proper execution of other BINLOG +statements). + +Nevertheless, I think using the server_id in the events of a BINLOG statement +is wrong: + +1. It is different behaviour from executing normal statement-based events not +written using BINLOG. + +2. It causes the possibility for infinite cycle of replication in a cyclic +replication setup, if the server ids in BINLOG are different from all other +server ids in the cycle. + +3. The functionality of applying events with original server id from the event +is still available by pointing the slave thread to the binlog. The +functionality of applying row-based binlog events with server id of the server +executing the BINLOG statements is not otherwise available. + +In fact most of the code from the slave thread that is now also run when +executing BINLOG statements is redundant, or does the wrong thing (like +updating binlog position). + +Maybe there is a confusion on the purpose of the BINLOG statement. Is it to be +able to apply row-based events manually to a server (mysqlbinlog|mysql)? Or is +it to be able to simulate the effect of the slave sql thread? I think the +former is the most important one. + -=-=(Knielsen - Mon, 07 Sep 2009, 10:06)=-=- Research worklog, bugs, and existing server code. Worked 2 hours and estimate 0 hours remain (original estimate increased by 2 hours). -=-=(Psergey - Mon, 17 Aug 2009, 14:13)=-=- Dependency created: 39 now depends on 50 -=-=(Psergey - Mon, 17 Aug 2009, 14:13)=-=- High-Level Specification modified. --- /tmp/wklog.50.old.11389 2009-08-17 14:13:05.000000000 +0300 +++ /tmp/wklog.50.new.11389 2009-08-17 14:13:05.000000000 +0300 @@ -1 +1,14 @@ +First item +---------- +AFAIU what needs to be done is: +1. record a source server version (it is in the first binlog event). +2. don't emit a BINLOG statement if the recorded version number is 5.0.x or + below. + +and we'll get a 5.0-applicable binlog. + +Second item +----------- +One question that one needs to sort out before disabling server_id change is +why it was put there in the first place? Should it be always removed? DESCRIPTION: According to complaints in BUG#46640: 1. mysqlbinlog will emit a 5.0-incompatible "format description binlog statement" even when reading a binary log that was produced by 5.0. This will cause an error when one tires to apply mysqlbinlog output to a 5.0.x server. 2. When one executes a BINLOG statement (containing "format description binlog statement" or other events), this will cause subsequent statements run in the same session to be binlogged with the server id of the last event executed, not with the real server id. This can cause problems like infinite recursive application in a circular replication topology. This WL is to fix these issues. HIGH-LEVEL SPECIFICATION: First item ---------- AFAIU what needs to be done is: 1. record a source server version (it is in the first binlog event). 2. don't emit a BINLOG statement if the recorded version number is 5.0.x or below. and we'll get a 5.0-applicable binlog. Second item ----------- One question that one needs to sort out before disabling server_id change is why it was put there in the first place? Should it be always removed? First, the problem is not the format description log event. In fact all log events have their own value of server_id, and every event in the BINLOG statement is executed with its own id as server_id. It seems it was introduced deliberately in the patch for Bug#32407. This patch makes sql thread and BINLOG statement share code path for executing the binary event, even though the bug is really about something different (outputting format description event to allow proper execution of other BINLOG statements). Nevertheless, I think using the server_id in the events of a BINLOG statement is wrong: 1. It is different behaviour from executing normal statement-based events not written using BINLOG. 2. It causes the possibility for infinite cycle of replication in a cyclic replication setup, if the server ids in BINLOG are different from all other server ids in the cycle. 3. The functionality of applying events with original server id from the event is still available by pointing the slave thread to the binlog. The functionality of applying row-based binlog events with server id of the server executing the BINLOG statements is not otherwise available. In fact most of the code from the slave thread that is now also run when executing BINLOG statements is redundant, or does the wrong thing (like updating binlog position). Maybe there is a confusion on the purpose of the BINLOG statement. Is it to be able to apply row-based events manually to a server (mysqlbinlog|mysql)? Or is it to be able to simulate the effect of the slave sql thread? I think the former is the most important one. LOW-LEVEL DESIGN: I think the fix for point 2 is to replace the call to apply_event_and_update_pos() in mysql_client_binlog_statement() with a direct call to ev->apply_event(). However, I need to check two things to be sure this is correct: 1. The existing code does if (!ev->when) ev->when= my_time(0) Need to understand if this is needed/correct or not. 2. The existing code does ev->update_pos(). I think this is redundant for BINLOG statement (as it uses a fake rli structure), but I need to check to make sure. Once this is done, point 1 may no longer be needed. The user can use --base64-output=never when applying the output to a 5.0 server, and omit that option when applying the output to a 5.1 server. There should be no need to omit the format description event in the output when other BINLOG statements for row events are present, as it no longer changes the server id. In fact the format description event is required to be able to execute other BINLOG statements, as its purpose is to define the binary format of the events contained in these statements. Alternatively, we could implement that if the format description event of the source binlog has server version < 5.1, and --base64-output=auto (default), then the format description event is omitted (and should any BINLOG statement be needed, unlikely as it is from a 5.0 server, we will need to throw an error). The binlog format version for 5.0 and 5.1 is actually the same, hence the need to look at server version to guess if the format description event can be omitted. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] Information for release notes
by Kristian Nielsen 27 Sep '09

27 Sep '09

Hi Daniel, Here is a rough changelog written from reading through bzr history. I took a dump of every commit in MariaDB that is not in MySQL 5.1.38, and wrote this summary of the changes. I don't have sufficient knowledge to parse through all of the Maria changes from before MariaDB started. Instead I wrote a generic entry for the Maria storage engine, and also added entries for what is already written (by Monty I think) on http://askmonty.org/wiki/index.php/MariaDB_versus_MySQL So this is probably the best shot we have at a complete list of relevant differences between MySQL and MariaDB. Do let me know if anyone finds anything missing or any errors. Daniel, I hope you can use this as the basis for the release notes. Maybe this list will also be useful for you to fill out the Manual on the Wiki. I am thinking you could check that all new features are documented, and add pages for those that are not. If not trivial, you could just make a stub page and ask on maria-developers@ for someone to fill them out? - Kristian. ----------------------------------------------------------------------- Generally: MariaDB-5.1.38-beta1 is based on MySQL-5.1.38, but has these additional features and bug fixes. Feature: mysql-test-run now has options --stop-file and --stop-keep-alive (also accessible with environment variables MTR_STOP_FILE and MTR_STOP_KEEP_ALIVE). With these, it is possible to pause a running test temporarily and let it continue later. Bug fix: mysqlslap: setting --engine does not get replicated http://bugs.mysql.com/bug.php?id=46967 mysqlslap: specifying --engine and --create does not work with --engine=<storage_engine>:<option> https://bugs.launchpad.net/maria/+bug/429773 Feature: Improvements to Gcov support in testing. Feature: New column TIME_MS in SHOW FULL PROCESSLIST and INFORMATION_SCHEMA.PROCESSLIST, similar to the old TIME column, but with microsecond resolution. Also fixes old TIME column to not be influenced by @TIMESTAMP. Patch by Percona. Bug fix: rpl_do_grant fails on PB-2 with a failing connect http://bugs.mysql.com/bug.php?id=47016 Bug fix: Windows: mysql-test-run --log-error fixed to not add --console. Bug fix: The myisam_crash_before_flush_keys test fails on Windows http://bugs.mysql.com/bug.php?id=47455 Bug fix: rpl.rpl_get_master_version_and_clock fails on hpux11.31 http://bugs.mysql.com/bug.php?id=46931 Bug fix: safe_process: FATAL ERROR, Unknown option: --nocore http://bugs.mysql.com/bug.php?id=46212 Feature: Optimizer improvement: Table elimination. http://askmonty.org/worklog/Server-Sprint/?tid=17 Bug fix: XtraDB crashes on startup on windows https://bugs.launchpad.net/maria/+bug/417751 Bug fix: Eliminate compiler warnings. Bug fix: Fix parsing of enum-valued options for plugins. https://bugs.launchpad.net/maria/+bug/423035 Feature: Enhancements to slow log. Includes details of execution plan and microsecond-precision resolution. Based on microslow patch by Percona. Feature: PBXT storage engine. PBXT is developed by PrimeBase Technologies, http://www.primebase.org/ Bug fix: Solaris build fixes. Feature: XtraDB storage engine as a replacement for the MySQL built-in InnoDB. XtraDB is based on the Oracle/Innobase InnoDB plugin version 1.0.3, with enhancements. XtraDB is developed by Percona. Feature: Performance improvements for common cases of character set conversion. Feature: Pool-of-threads, allowing to map a high number of simultaneous connections onto a lower number of operating system treads, to reduce overhead with using large number of threads. Feature: New handler call prepare_index_scan() and other small improvements to the internal storage engine handler API. Bug fix: query_cache_debug.test fails http://bugs.mysql.com/bug.php?id=45632 Bug fix: enum-style command-line options are not honoured (maria.maria-recover fails) http://bugs.mysql.com/bug.php?id=41010 Bug fix: mysql-test-run sometimes terminated mysqld early, causing loss of memory leak error reports from Valgrind and GCov test coverage output. http://bugs.mysql.com/bug.php?id=43418 Bug fix: Several Valgrind reported bugs in the source code fixed. Bug fix: Save SAFE_MUTEX configure #define in config.h, to facilitate correct build options for plugins. Feature: ./configure now outputs a summary section at the end of the output. (By C.J. Adams-Collier). Bug fix: test maria.maria fails if server built without '--with-partition' https://bugs.launchpad.net/maria/+bug/330611 Feature: NDB storage engine disabled in MariaDB builds. (NDB is not supported in MariaDB). Feature: Added --abort-source-on-error to the mysql client. Feature: Faster CHECKSUM TABLE. Feature: Debugging code to check for taking mutexes in the wrong order, which enables to catch potential deadlocks in the server code. Feature: Maria storage engine. The Maria storage engine is an enhanment over the MyISAM storage engine which provides journaling and crash recovery.

4 3

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2737: Fix all innodb tests being disabled when running testsuite as root.
by noreply＠launchpad.net 26 Sep '09

26 Sep '09

------------------------------------------------------------ revno: 2737 committer: knielsen(a)knielsen-hq.org branch nick: work-5.1-release timestamp: Sat 2009-09-26 04:25:56 +0200 message: Fix all innodb tests being disabled when running testsuite as root. modified: mysql-test/mysql-test-run.pl -- lp:maria https://code.launchpad.net/~maria-captains/maria/5.1 Your team Maria developers is subscribed to branch lp:maria. To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2737)
by knielsen＠knielsen-hq.org 26 Sep '09

26 Sep '09

#At lp:maria 2737 knielsen(a)knielsen-hq.org 2009-09-26 Fix all innodb tests being disabled when running testsuite as root. modified: mysql-test/mysql-test-run.pl === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-09-25 14:38:02 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-09-26 02:25:56 +0000 @@ -1500,6 +1500,10 @@ sub collect_mysqld_features { mtr_add_arg($args, "--datadir=%s", mixed_path($tmpdir)); mtr_add_arg($args, "--language=%s", $path_language); mtr_add_arg($args, "--skip-grant-tables"); + my $euid= $>; + if (!IS_WINDOWS and $euid == 0) { + mtr_add_arg($args, "--user=root"); + } mtr_add_arg($args, "--verbose"); mtr_add_arg($args, "--help");

1 0

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2736: Fix some test failures found during RPM package building:
by noreply＠launchpad.net 25 Sep '09

25 Sep '09

------------------------------------------------------------ revno: 2736 committer: knielsen(a)knielsen-hq.org branch nick: work-5.1-release timestamp: Fri 2009-09-25 16:38:02 +0200 message: Fix some test failures found during RPM package building: - mysqlslap result file update after merge. - Fix skipping certain tests when running test suite as root, got broken somehow. modified: mysql-test/mysql-test-run.pl mysql-test/r/mysqlslap.result mysql-test/t/mysqld_option_err.test -- lp:maria https://code.launchpad.net/~maria-captains/maria/5.1 Your team Maria developers is subscribed to branch lp:maria. To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2736)
by knielsen＠knielsen-hq.org 25 Sep '09

25 Sep '09

#At lp:maria 2736 knielsen(a)knielsen-hq.org 2009-09-25 Fix some test failures found during RPM package building: - mysqlslap result file update after merge. - Fix skipping certain tests when running test suite as root, got broken somehow. modified: mysql-test/mysql-test-run.pl mysql-test/r/mysqlslap.result mysql-test/t/mysqld_option_err.test per-file messages: mysql-test/mysql-test-run.pl Somehow skipping tests when running as root got broken. The mysqltest if() no longer seems to accept YES as a true value, so use 1 for true value instead. mysql-test/r/mysqlslap.result Result file update after change in engine behaviour of mysqlslap. mysql-test/t/mysqld_option_err.test This test does not work when run as root. === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-09-25 08:56:53 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-09-25 14:38:02 +0000 @@ -2288,7 +2288,7 @@ sub check_running_as_root () { { mtr_warning("running this script as _root_ will cause some " . "tests to be skipped"); - $ENV{'MYSQL_TEST_ROOT'}= "YES"; + $ENV{'MYSQL_TEST_ROOT'}= "1"; } chmod(oct("0755"), $test_file); === modified file 'mysql-test/r/mysqlslap.result' --- a/mysql-test/r/mysqlslap.result 2007-12-20 20:32:16 +0000 +++ b/mysql-test/r/mysqlslap.result 2009-09-25 14:38:02 +0000 @@ -122,8 +122,7 @@ DROP SCHEMA IF EXISTS `mysqlslap`; DROP SCHEMA IF EXISTS `mysqlslap`; CREATE SCHEMA `mysqlslap`; use mysqlslap; -set storage_engine=`heap`; -CREATE TABLE t1 (id int, name varchar(64)); +CREATE TABLE t1 (id int, name varchar(64)) Engine = heap; create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); @@ -133,8 +132,7 @@ DROP SCHEMA IF EXISTS `mysqlslap`; DROP SCHEMA IF EXISTS `mysqlslap`; CREATE SCHEMA `mysqlslap`; use mysqlslap; -set storage_engine=`myisam`; -CREATE TABLE t1 (id int, name varchar(64)); +CREATE TABLE t1 (id int, name varchar(64)) Engine = myisam; create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); @@ -144,8 +142,7 @@ DROP SCHEMA IF EXISTS `mysqlslap`; DROP SCHEMA IF EXISTS `mysqlslap`; CREATE SCHEMA `mysqlslap`; use mysqlslap; -set storage_engine=`heap`; -CREATE TABLE t1 (id int, name varchar(64)); +CREATE TABLE t1 (id int, name varchar(64)) Engine = heap; create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); @@ -157,8 +154,7 @@ DROP SCHEMA IF EXISTS `mysqlslap`; DROP SCHEMA IF EXISTS `mysqlslap`; CREATE SCHEMA `mysqlslap`; use mysqlslap; -set storage_engine=`myisam`; -CREATE TABLE t1 (id int, name varchar(64)); +CREATE TABLE t1 (id int, name varchar(64)) Engine = myisam; create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); @@ -170,8 +166,7 @@ DROP SCHEMA IF EXISTS `mysqlslap`; DROP SCHEMA IF EXISTS `mysqlslap`; CREATE SCHEMA `mysqlslap`; use mysqlslap; -set storage_engine=`heap`; -CREATE TABLE t1 (id int, name varchar(64)); +CREATE TABLE t1 (id int, name varchar(64)) Engine = heap; create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); @@ -196,8 +191,7 @@ DROP SCHEMA IF EXISTS `mysqlslap`; DROP SCHEMA IF EXISTS `mysqlslap`; CREATE SCHEMA `mysqlslap`; use mysqlslap; -set storage_engine=`myisam`; -CREATE TABLE t1 (id int, name varchar(64)); +CREATE TABLE t1 (id int, name varchar(64)) Engine = myisam; create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); === modified file 'mysql-test/t/mysqld_option_err.test' --- a/mysql-test/t/mysqld_option_err.test 2009-09-03 13:05:02 +0000 +++ b/mysql-test/t/mysqld_option_err.test 2009-09-25 14:38:02 +0000 @@ -10,6 +10,9 @@ --source include/not_embedded.inc +# mysqld refuses to run as root normally. +-- source include/not_as_root.inc + # We have not run (and do not need) bootstrap of the server. We just # give it a dummy data directory (for log files etc).

1 0

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2735: Merge MySQL-5.1.38 and XtraDB-7 into MariaDB.
by noreply＠launchpad.net 25 Sep '09

25 Sep '09

Merge authors: <Dao-Gang.Qu(a)sun.com> Aleksandr Kuzminsky (akuzminsky) Alexander Barkov <bar(a)mysql.com> Alexander Nozdrin <alik(a)sun.com> Alexey Botchkov <holyfoot(a)mysql.com>... ------------------------------------------------------------ revno: 2735 [merge] committer: knielsen(a)knielsen-hq.org branch nick: work-5.1-release timestamp: Fri 2009-09-25 10:56:53 +0200 message: Merge MySQL-5.1.38 and XtraDB-7 into MariaDB. Merge Percona microsec_process patch. Includes lots of after-merge fixes, Windows fixes, and other misc. small fixes. removed: cmd-line-utils/libedit/README cmd-line-utils/libedit/filecomplete.c cmd-line-utils/libedit/filecomplete.h mysql-test/include/count_sessions.inc mysql-test/include/diff_tables.inc mysql-test/include/wait_for_status_var.inc mysql-test/include/wait_show_condition.inc mysql-test/include/wait_until_count_sessions.inc mysql-test/r/innodb_bug42419.result mysql-test/suite/funcs_1/datadict/charset_collation.inc mysql-test/suite/funcs_1/r/charset_collation_1.result mysql-test/suite/funcs_1/r/charset_collation_2.result mysql-test/suite/funcs_1/r/charset_collation_3.result mysql-test/suite/funcs_1/t/charset_collation_1.test mysql-test/suite/funcs_1/t/charset_collation_2.test mysql-test/suite/funcs_1/t/charset_collation_3.test mysql-test/suite/funcs_1/t/ndb_storedproc_06.tes mysql-test/suite/funcs_1/t/ndb_storedproc_08.tes mysql-test/suite/rpl/t/rpl_000015-slave.sh mysql-test/t/innodb_bug42419.test sql/mysql_priv.h.pp added: cmd-line-utils/libedit/README cmd-line-utils/libedit/filecomplete.c cmd-line-utils/libedit/filecomplete.h mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test mysql-test/include/count_sessions.inc mysql-test/include/diff_master_slave.inc mysql-test/include/diff_tables.inc mysql-test/include/kill_query.inc mysql-test/include/kill_query_and_diff_master_slave.inc mysql-test/include/mysqldump.inc mysql-test/include/no_valgrind_without_big.inc mysql-test/include/wait_for_slave_io_error.inc mysql-test/include/wait_for_status_var.inc mysql-test/include/wait_show_condition.inc mysql-test/include/wait_until_count_sessions.inc mysql-test/r/bug40113.result mysql-test/r/bug46080.result mysql-test/r/ctype_gbk_binlog.result mysql-test/r/innodb_bug21704.result mysql-test/r/innodb_bug40565.result mysql-test/r/innodb_bug42101-nonzero.result mysql-test/r/innodb_bug42101.result mysql-test/r/innodb_bug42419.result mysql-test/r/innodb_bug45357.result mysql-test/r/log_tables_debug.result mysql-test/r/myisam_crash_before_flush_keys.result mysql-test/r/myisam_debug.result mysql-test/r/mysql-bug45236.result mysql-test/r/mysqldump_restore.result mysql-test/r/parser_not_embedded.result mysql-test/r/partition_not_embedded.result mysql-test/r/partition_rename_longfilename.result mysql-test/r/sp-fib.result mysql-test/std_data/bug37631.MYD mysql-test/std_data/bug37631.MYI mysql-test/std_data/bug37631.frm mysql-test/suite/binlog/r/binlog_incident.result mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_db_filter.result mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result mysql-test/suite/binlog/r/binlog_tbl_metadata.result mysql-test/suite/binlog/t/binlog_incident-master.opt mysql-test/suite/binlog/t/binlog_incident.test mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_db_filter.test mysql-test/suite/binlog/t/binlog_stm_unsafe_warning-master.opt mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test mysql-test/suite/binlog/t/binlog_tbl_metadata.test mysql-test/suite/bugs/r/rpl_bug38205.result mysql-test/suite/bugs/t/rpl_bug38205.test mysql-test/suite/funcs_1/r/charset_collation.result mysql-test/suite/funcs_1/t/charset_collation.test mysql-test/suite/ibmdb2i/ mysql-test/suite/ibmdb2i/include/ mysql-test/suite/ibmdb2i/include/have_i54.inc mysql-test/suite/ibmdb2i/include/have_i61.inc mysql-test/suite/ibmdb2i/include/have_ibmdb2i.inc mysql-test/suite/ibmdb2i/r/ mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44020.result mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44025.result mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44232.result mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44610.result mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45196.result mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45793.result mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45983.result mysql-test/suite/ibmdb2i/r/ibmdb2i_collations.result mysql-test/suite/ibmdb2i/t/ mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44020.test mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44025.test mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44232.test mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44610.test mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45196.test mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45793.test mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45983.test mysql-test/suite/ibmdb2i/t/ibmdb2i_collations.test mysql-test/suite/innodb/ mysql-test/suite/innodb/include/ mysql-test/suite/innodb/include/have_innodb_plugin.inc mysql-test/suite/innodb/include/innodb-index.inc mysql-test/suite/innodb/r/ mysql-test/suite/innodb/r/innodb-analyze.result mysql-test/suite/innodb/r/innodb-index.result mysql-test/suite/innodb/r/innodb-index_ucs2.result mysql-test/suite/innodb/r/innodb-timeout.result mysql-test/suite/innodb/r/innodb-use-sys-malloc.result mysql-test/suite/innodb/r/innodb-zip.result mysql-test/suite/innodb/r/innodb_bug36169.result mysql-test/suite/innodb/r/innodb_bug36172.result mysql-test/suite/innodb/r/innodb_bug40360.result mysql-test/suite/innodb/r/innodb_bug41904.result mysql-test/suite/innodb/r/innodb_bug44032.result mysql-test/suite/innodb/r/innodb_file_format.result mysql-test/suite/innodb/r/innodb_information_schema.result mysql-test/suite/innodb/t/ mysql-test/suite/innodb/t/disabled.def mysql-test/suite/innodb/t/innodb-analyze.test mysql-test/suite/innodb/t/innodb-index.test mysql-test/suite/innodb/t/innodb-index_ucs2.test mysql-test/suite/innodb/t/innodb-timeout.test mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt mysql-test/suite/innodb/t/innodb-use-sys-malloc.test mysql-test/suite/innodb/t/innodb-zip.test mysql-test/suite/innodb/t/innodb_bug36169.test mysql-test/suite/innodb/t/innodb_bug36172.test mysql-test/suite/innodb/t/innodb_bug40360.test mysql-test/suite/innodb/t/innodb_bug41904.test mysql-test/suite/innodb/t/innodb_bug44032.test mysql-test/suite/innodb/t/innodb_file_format.test mysql-test/suite/innodb/t/innodb_information_schema.test mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result mysql-test/suite/rpl/r/rpl_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_bug38694.result mysql-test/suite/rpl/r/rpl_concurrency_error.result mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result mysql-test/suite/rpl/r/rpl_init_slave_errors.result mysql-test/suite/rpl/r/rpl_killed_ddl.result mysql-test/suite/rpl/r/rpl_name_const.result mysql-test/suite/rpl/t/rpl_begin_commit_rollback-slave.opt mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test mysql-test/suite/rpl/t/rpl_binlog_max_cache_size-master.opt mysql-test/suite/rpl/t/rpl_binlog_max_cache_size.test mysql-test/suite/rpl/t/rpl_bug38694-slave.opt mysql-test/suite/rpl/t/rpl_bug38694.test mysql-test/suite/rpl/t/rpl_concurrency_error-master.opt mysql-test/suite/rpl/t/rpl_concurrency_error.test mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test mysql-test/suite/rpl/t/rpl_init_slave_errors.test mysql-test/suite/rpl/t/rpl_killed_ddl-master.opt mysql-test/suite/rpl/t/rpl_killed_ddl.test mysql-test/suite/rpl/t/rpl_name_const.test mysql-test/suite/rpl/t/rpl_start_stop_slave-slave.opt mysql-test/t/bug40113-master.opt mysql-test/t/bug40113.test mysql-test/t/bug46080-master.opt mysql-test/t/bug46080.test mysql-test/t/ctype_gbk_binlog.test mysql-test/t/innodb_bug21704.test mysql-test/t/innodb_bug40565.test mysql-test/t/innodb_bug42101-nonzero-master.opt mysql-test/t/innodb_bug42101-nonzero.test mysql-test/t/innodb_bug42101.test mysql-test/t/innodb_bug42419.test mysql-test/t/innodb_bug45357.test mysql-test/t/log_tables_debug.test mysql-test/t/myisam_crash_before_flush_keys-master.opt mysql-test/t/myisam_crash_before_flush_keys.test mysql-test/t/myisam_debug.test mysql-test/t/mysql-bug45236.test mysql-test/t/mysqldump_restore.test mysql-test/t/parser_not_embedded.test mysql-test/t/partition_not_embedded.test mysql-test/t/partition_rename_longfilename.test mysql-test/t/sp-fib.test storage/innobase/include/fsp0types.h storage/innodb_plugin/ storage/innodb_plugin/CMakeLists.txt storage/innodb_plugin/COPYING storage/innodb_plugin/COPYING.Google storage/innodb_plugin/COPYING.Percona storage/innodb_plugin/COPYING.Sun_Microsystems storage/innodb_plugin/ChangeLog storage/innodb_plugin/Doxyfile storage/innodb_plugin/Makefile.am storage/innodb_plugin/README storage/innodb_plugin/btr/ storage/innodb_plugin/btr/btr0btr.c storage/innodb_plugin/btr/btr0cur.c storage/innodb_plugin/btr/btr0pcur.c storage/innodb_plugin/btr/btr0sea.c storage/innodb_plugin/buf/ storage/innodb_plugin/buf/buf0buddy.c storage/innodb_plugin/buf/buf0buf.c storage/innodb_plugin/buf/buf0flu.c storage/innodb_plugin/buf/buf0lru.c storage/innodb_plugin/buf/buf0rea.c storage/innodb_plugin/compile-innodb storage/innodb_plugin/compile-innodb-debug storage/innodb_plugin/data/ storage/innodb_plugin/data/data0data.c storage/innodb_plugin/data/data0type.c storage/innodb_plugin/dict/ storage/innodb_plugin/dict/dict0boot.c storage/innodb_plugin/dict/dict0crea.c storage/innodb_plugin/dict/dict0dict.c storage/innodb_plugin/dict/dict0load.c storage/innodb_plugin/dict/dict0mem.c storage/innodb_plugin/dyn/ storage/innodb_plugin/dyn/dyn0dyn.c storage/innodb_plugin/eval/ storage/innodb_plugin/eval/eval0eval.c storage/innodb_plugin/eval/eval0proc.c storage/innodb_plugin/fil/ storage/innodb_plugin/fil/fil0fil.c storage/innodb_plugin/fsp/ storage/innodb_plugin/fsp/fsp0fsp.c storage/innodb_plugin/fut/ storage/innodb_plugin/fut/fut0fut.c storage/innodb_plugin/fut/fut0lst.c storage/innodb_plugin/ha/ storage/innodb_plugin/ha/ha0ha.c storage/innodb_plugin/ha/ha0storage.c storage/innodb_plugin/ha/hash0hash.c storage/innodb_plugin/ha_innodb.def storage/innodb_plugin/handler/ storage/innodb_plugin/handler/ha_innodb.cc storage/innodb_plugin/handler/ha_innodb.h storage/innodb_plugin/handler/handler0alter.cc storage/innodb_plugin/handler/handler0vars.h storage/innodb_plugin/handler/i_s.cc storage/innodb_plugin/handler/i_s.h storage/innodb_plugin/handler/mysql_addons.cc storage/innodb_plugin/handler/win_delay_loader.cc storage/innodb_plugin/ibuf/ storage/innodb_plugin/ibuf/ibuf0ibuf.c storage/innodb_plugin/include/ storage/innodb_plugin/include/btr0btr.h storage/innodb_plugin/include/btr0btr.ic storage/innodb_plugin/include/btr0cur.h storage/innodb_plugin/include/btr0cur.ic storage/innodb_plugin/include/btr0pcur.h storage/innodb_plugin/include/btr0pcur.ic storage/innodb_plugin/include/btr0sea.h storage/innodb_plugin/include/btr0sea.ic storage/innodb_plugin/include/btr0types.h storage/innodb_plugin/include/buf0buddy.h storage/innodb_plugin/include/buf0buddy.ic storage/innodb_plugin/include/buf0buf.h storage/innodb_plugin/include/buf0buf.ic storage/innodb_plugin/include/buf0flu.h storage/innodb_plugin/include/buf0flu.ic storage/innodb_plugin/include/buf0lru.h storage/innodb_plugin/include/buf0lru.ic storage/innodb_plugin/include/buf0rea.h storage/innodb_plugin/include/buf0types.h storage/innodb_plugin/include/data0data.h storage/innodb_plugin/include/data0data.ic storage/innodb_plugin/include/data0type.h storage/innodb_plugin/include/data0type.ic storage/innodb_plugin/include/data0types.h storage/innodb_plugin/include/db0err.h storage/innodb_plugin/include/dict0boot.h storage/innodb_plugin/include/dict0boot.ic storage/innodb_plugin/include/dict0crea.h storage/innodb_plugin/include/dict0crea.ic storage/innodb_plugin/include/dict0dict.h storage/innodb_plugin/include/dict0dict.ic storage/innodb_plugin/include/dict0load.h storage/innodb_plugin/include/dict0load.ic storage/innodb_plugin/include/dict0mem.h storage/innodb_plugin/include/dict0mem.ic storage/innodb_plugin/include/dict0types.h storage/innodb_plugin/include/dyn0dyn.h storage/innodb_plugin/include/dyn0dyn.ic storage/innodb_plugin/include/eval0eval.h storage/innodb_plugin/include/eval0eval.ic storage/innodb_plugin/include/eval0proc.h storage/innodb_plugin/include/eval0proc.ic storage/innodb_plugin/include/fil0fil.h storage/innodb_plugin/include/fsp0fsp.h storage/innodb_plugin/include/fsp0fsp.ic storage/innodb_plugin/include/fsp0types.h storage/innodb_plugin/include/fut0fut.h storage/innodb_plugin/include/fut0fut.ic storage/innodb_plugin/include/fut0lst.h storage/innodb_plugin/include/fut0lst.ic storage/innodb_plugin/include/ha0ha.h storage/innodb_plugin/include/ha0ha.ic storage/innodb_plugin/include/ha0storage.h storage/innodb_plugin/include/ha0storage.ic storage/innodb_plugin/include/ha_prototypes.h storage/innodb_plugin/include/handler0alter.h storage/innodb_plugin/include/hash0hash.h storage/innodb_plugin/include/hash0hash.ic storage/innodb_plugin/include/ibuf0ibuf.h storage/innodb_plugin/include/ibuf0ibuf.ic storage/innodb_plugin/include/ibuf0types.h storage/innodb_plugin/include/lock0iter.h storage/innodb_plugin/include/lock0lock.h storage/innodb_plugin/include/lock0lock.ic storage/innodb_plugin/include/lock0priv.h storage/innodb_plugin/include/lock0priv.ic storage/innodb_plugin/include/lock0types.h storage/innodb_plugin/include/log0log.h storage/innodb_plugin/include/log0log.ic storage/innodb_plugin/include/log0recv.h storage/innodb_plugin/include/log0recv.ic storage/innodb_plugin/include/mach0data.h storage/innodb_plugin/include/mach0data.ic storage/innodb_plugin/include/mem0dbg.h storage/innodb_plugin/include/mem0dbg.ic storage/innodb_plugin/include/mem0mem.h storage/innodb_plugin/include/mem0mem.ic storage/innodb_plugin/include/mem0pool.h storage/innodb_plugin/include/mem0pool.ic storage/innodb_plugin/include/mtr0log.h storage/innodb_plugin/include/mtr0log.ic storage/innodb_plugin/include/mtr0mtr.h storage/innodb_plugin/include/mtr0mtr.ic storage/innodb_plugin/include/mtr0types.h storage/innodb_plugin/include/mysql_addons.h storage/innodb_plugin/include/os0file.h storage/innodb_plugin/include/os0proc.h storage/innodb_plugin/include/os0proc.ic storage/innodb_plugin/include/os0sync.h storage/innodb_plugin/include/os0sync.ic storage/innodb_plugin/include/os0thread.h storage/innodb_plugin/include/os0thread.ic storage/innodb_plugin/include/page0cur.h storage/innodb_plugin/include/page0cur.ic storage/innodb_plugin/include/page0page.h storage/innodb_plugin/include/page0page.ic storage/innodb_plugin/include/page0types.h storage/innodb_plugin/include/page0zip.h storage/innodb_plugin/include/page0zip.ic storage/innodb_plugin/include/pars0grm.h storage/innodb_plugin/include/pars0opt.h storage/innodb_plugin/include/pars0opt.ic storage/innodb_plugin/include/pars0pars.h storage/innodb_plugin/include/pars0pars.ic storage/innodb_plugin/include/pars0sym.h storage/innodb_plugin/include/pars0sym.ic storage/innodb_plugin/include/pars0types.h storage/innodb_plugin/include/que0que.h storage/innodb_plugin/include/que0que.ic storage/innodb_plugin/include/que0types.h storage/innodb_plugin/include/read0read.h storage/innodb_plugin/include/read0read.ic storage/innodb_plugin/include/read0types.h storage/innodb_plugin/include/rem0cmp.h storage/innodb_plugin/include/rem0cmp.ic storage/innodb_plugin/include/rem0rec.h storage/innodb_plugin/include/rem0rec.ic storage/innodb_plugin/include/rem0types.h storage/innodb_plugin/include/row0ext.h storage/innodb_plugin/include/row0ext.ic storage/innodb_plugin/include/row0ins.h storage/innodb_plugin/include/row0ins.ic storage/innodb_plugin/include/row0merge.h storage/innodb_plugin/include/row0mysql.h storage/innodb_plugin/include/row0mysql.ic storage/innodb_plugin/include/row0purge.h storage/innodb_plugin/include/row0purge.ic storage/innodb_plugin/include/row0row.h storage/innodb_plugin/include/row0row.ic storage/innodb_plugin/include/row0sel.h storage/innodb_plugin/include/row0sel.ic storage/innodb_plugin/include/row0types.h storage/innodb_plugin/include/row0uins.h storage/innodb_plugin/include/row0uins.ic storage/innodb_plugin/include/row0umod.h storage/innodb_plugin/include/row0umod.ic storage/innodb_plugin/include/row0undo.h storage/innodb_plugin/include/row0undo.ic storage/innodb_plugin/include/row0upd.h storage/innodb_plugin/include/row0upd.ic storage/innodb_plugin/include/row0vers.h storage/innodb_plugin/include/row0vers.ic storage/innodb_plugin/include/srv0que.h storage/innodb_plugin/include/srv0srv.h storage/innodb_plugin/include/srv0srv.ic storage/innodb_plugin/include/srv0start.h storage/innodb_plugin/include/sync0arr.h storage/innodb_plugin/include/sync0arr.ic storage/innodb_plugin/include/sync0rw.h storage/innodb_plugin/include/sync0rw.ic storage/innodb_plugin/include/sync0sync.h storage/innodb_plugin/include/sync0sync.ic storage/innodb_plugin/include/sync0types.h storage/innodb_plugin/include/thr0loc.h storage/innodb_plugin/include/thr0loc.ic storage/innodb_plugin/include/trx0i_s.h storage/innodb_plugin/include/trx0purge.h storage/innodb_plugin/include/trx0purge.ic storage/innodb_plugin/include/trx0rec.h storage/innodb_plugin/include/trx0rec.ic storage/innodb_plugin/include/trx0roll.h storage/innodb_plugin/include/trx0roll.ic storage/innodb_plugin/include/trx0rseg.h storage/innodb_plugin/include/trx0rseg.ic storage/innodb_plugin/include/trx0sys.h storage/innodb_plugin/include/trx0sys.ic storage/innodb_plugin/include/trx0trx.h storage/innodb_plugin/include/trx0trx.ic storage/innodb_plugin/include/trx0types.h storage/innodb_plugin/include/trx0undo.h storage/innodb_plugin/include/trx0undo.ic storage/innodb_plugin/include/trx0xa.h storage/innodb_plugin/include/univ.i storage/innodb_plugin/include/usr0sess.h storage/innodb_plugin/include/usr0sess.ic storage/innodb_plugin/include/usr0types.h storage/innodb_plugin/include/ut0auxconf.h storage/innodb_plugin/include/ut0byte.h storage/innodb_plugin/include/ut0byte.ic storage/innodb_plugin/include/ut0dbg.h storage/innodb_plugin/include/ut0list.h storage/innodb_plugin/include/ut0list.ic storage/innodb_plugin/include/ut0lst.h storage/innodb_plugin/include/ut0mem.h storage/innodb_plugin/include/ut0mem.ic storage/innodb_plugin/include/ut0rnd.h storage/innodb_plugin/include/ut0rnd.ic storage/innodb_plugin/include/ut0sort.h storage/innodb_plugin/include/ut0ut.h storage/innodb_plugin/include/ut0ut.ic storage/innodb_plugin/include/ut0vec.h storage/innodb_plugin/include/ut0vec.ic storage/innodb_plugin/include/ut0wqueue.h storage/innodb_plugin/lock/ storage/innodb_plugin/lock/lock0iter.c storage/innodb_plugin/lock/lock0lock.c storage/innodb_plugin/log/ storage/innodb_plugin/log/log0log.c storage/innodb_plugin/log/log0recv.c storage/innodb_plugin/mach/ storage/innodb_plugin/mach/mach0data.c storage/innodb_plugin/mem/ storage/innodb_plugin/mem/mem0dbg.c storage/innodb_plugin/mem/mem0mem.c storage/innodb_plugin/mem/mem0pool.c storage/innodb_plugin/mtr/ storage/innodb_plugin/mtr/mtr0log.c storage/innodb_plugin/mtr/mtr0mtr.c storage/innodb_plugin/mysql-test/ storage/innodb_plugin/mysql-test/ctype_innodb_like.inc storage/innodb_plugin/mysql-test/have_innodb.inc storage/innodb_plugin/mysql-test/innodb-analyze.result storage/innodb_plugin/mysql-test/innodb-analyze.test storage/innodb_plugin/mysql-test/innodb-autoinc.result storage/innodb_plugin/mysql-test/innodb-autoinc.test storage/innodb_plugin/mysql-test/innodb-index.inc storage/innodb_plugin/mysql-test/innodb-index.result storage/innodb_plugin/mysql-test/innodb-index.test storage/innodb_plugin/mysql-test/innodb-index_ucs2.result storage/innodb_plugin/mysql-test/innodb-index_ucs2.test storage/innodb_plugin/mysql-test/innodb-lock.result storage/innodb_plugin/mysql-test/innodb-lock.test storage/innodb_plugin/mysql-test/innodb-master.opt storage/innodb_plugin/mysql-test/innodb-replace.result storage/innodb_plugin/mysql-test/innodb-replace.test storage/innodb_plugin/mysql-test/innodb-semi-consistent-master.opt storage/innodb_plugin/mysql-test/innodb-semi-consistent.result storage/innodb_plugin/mysql-test/innodb-semi-consistent.test storage/innodb_plugin/mysql-test/innodb-timeout.result storage/innodb_plugin/mysql-test/innodb-timeout.test storage/innodb_plugin/mysql-test/innodb-use-sys-malloc-master.opt storage/innodb_plugin/mysql-test/innodb-use-sys-malloc.result storage/innodb_plugin/mysql-test/innodb-use-sys-malloc.test storage/innodb_plugin/mysql-test/innodb-zip.result storage/innodb_plugin/mysql-test/innodb-zip.test storage/innodb_plugin/mysql-test/innodb.result storage/innodb_plugin/mysql-test/innodb.test storage/innodb_plugin/mysql-test/innodb_bug21704.result storage/innodb_plugin/mysql-test/innodb_bug21704.test storage/innodb_plugin/mysql-test/innodb_bug34053.result storage/innodb_plugin/mysql-test/innodb_bug34053.test storage/innodb_plugin/mysql-test/innodb_bug34300.result storage/innodb_plugin/mysql-test/innodb_bug34300.test storage/innodb_plugin/mysql-test/innodb_bug35220.result storage/innodb_plugin/mysql-test/innodb_bug35220.test storage/innodb_plugin/mysql-test/innodb_bug36169.result storage/innodb_plugin/mysql-test/innodb_bug36169.test storage/innodb_plugin/mysql-test/innodb_bug36172.result storage/innodb_plugin/mysql-test/innodb_bug36172.test storage/innodb_plugin/mysql-test/innodb_bug40360.result storage/innodb_plugin/mysql-test/innodb_bug40360.test storage/innodb_plugin/mysql-test/innodb_bug40565.result storage/innodb_plugin/mysql-test/innodb_bug40565.test storage/innodb_plugin/mysql-test/innodb_bug41904.result storage/innodb_plugin/mysql-test/innodb_bug41904.test storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero-master.opt storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero.result storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero.test storage/innodb_plugin/mysql-test/innodb_bug42101.result storage/innodb_plugin/mysql-test/innodb_bug42101.test storage/innodb_plugin/mysql-test/innodb_bug44032.result storage/innodb_plugin/mysql-test/innodb_bug44032.test storage/innodb_plugin/mysql-test/innodb_bug45357.result storage/innodb_plugin/mysql-test/innodb_bug45357.test storage/innodb_plugin/mysql-test/innodb_file_format.result storage/innodb_plugin/mysql-test/innodb_file_format.test storage/innodb_plugin/mysql-test/innodb_information_schema.result storage/innodb_plugin/mysql-test/innodb_information_schema.test storage/innodb_plugin/mysql-test/innodb_trx_weight.inc storage/innodb_plugin/mysql-test/innodb_trx_weight.result storage/innodb_plugin/mysql-test/innodb_trx_weight.test storage/innodb_plugin/mysql-test/patches/ storage/innodb_plugin/mysql-test/patches/README storage/innodb_plugin/mysql-test/patches/index_merge_innodb-explain.diff storage/innodb_plugin/mysql-test/patches/information_schema.diff storage/innodb_plugin/mysql-test/patches/innodb-index.diff storage/innodb_plugin/mysql-test/patches/innodb_file_per_table.diff storage/innodb_plugin/mysql-test/patches/innodb_lock_wait_timeout.diff storage/innodb_plugin/mysql-test/patches/innodb_thread_concurrency_basic.diff storage/innodb_plugin/mysql-test/patches/partition_innodb.diff storage/innodb_plugin/os/ storage/innodb_plugin/os/os0file.c storage/innodb_plugin/os/os0proc.c storage/innodb_plugin/os/os0sync.c storage/innodb_plugin/os/os0thread.c storage/innodb_plugin/page/ storage/innodb_plugin/page/page0cur.c storage/innodb_plugin/page/page0page.c storage/innodb_plugin/page/page0zip.c storage/innodb_plugin/pars/ storage/innodb_plugin/pars/lexyy.c storage/innodb_plugin/pars/make_bison.sh storage/innodb_plugin/pars/make_flex.sh storage/innodb_plugin/pars/pars0grm.c storage/innodb_plugin/pars/pars0grm.y storage/innodb_plugin/pars/pars0lex.l storage/innodb_plugin/pars/pars0opt.c storage/innodb_plugin/pars/pars0pars.c storage/innodb_plugin/pars/pars0sym.c storage/innodb_plugin/plug.in storage/innodb_plugin/que/ storage/innodb_plugin/que/que0que.c storage/innodb_plugin/read/ storage/innodb_plugin/read/read0read.c storage/innodb_plugin/rem/ storage/innodb_plugin/rem/rem0cmp.c storage/innodb_plugin/rem/rem0rec.c storage/innodb_plugin/row/ storage/innodb_plugin/row/row0ext.c storage/innodb_plugin/row/row0ins.c storage/innodb_plugin/row/row0merge.c storage/innodb_plugin/row/row0mysql.c storage/innodb_plugin/row/row0purge.c storage/innodb_plugin/row/row0row.c storage/innodb_plugin/row/row0sel.c storage/innodb_plugin/row/row0uins.c storage/innodb_plugin/row/row0umod.c storage/innodb_plugin/row/row0undo.c storage/innodb_plugin/row/row0upd.c storage/innodb_plugin/row/row0vers.c storage/innodb_plugin/scripts/ storage/innodb_plugin/scripts/install_innodb_plugins.sql storage/innodb_plugin/scripts/install_innodb_plugins_win.sql storage/innodb_plugin/setup.sh storage/innodb_plugin/srv/ storage/innodb_plugin/srv/srv0que.c storage/innodb_plugin/srv/srv0srv.c storage/innodb_plugin/srv/srv0start.c storage/innodb_plugin/sync/ storage/innodb_plugin/sync/sync0arr.c storage/innodb_plugin/sync/sync0rw.c storage/innodb_plugin/sync/sync0sync.c storage/innodb_plugin/thr/ storage/innodb_plugin/thr/thr0loc.c storage/innodb_plugin/trx/ storage/innodb_plugin/trx/trx0i_s.c storage/innodb_plugin/trx/trx0purge.c storage/innodb_plugin/trx/trx0rec.c storage/innodb_plugin/trx/trx0roll.c storage/innodb_plugin/trx/trx0rseg.c storage/innodb_plugin/trx/trx0sys.c storage/innodb_plugin/trx/trx0trx.c storage/innodb_plugin/trx/trx0undo.c storage/innodb_plugin/usr/ storage/innodb_plugin/usr/usr0sess.c storage/innodb_plugin/ut/ storage/innodb_plugin/ut/ut0auxconf_atomic_pthread_t_gcc.c storage/innodb_plugin/ut/ut0auxconf_atomic_pthread_t_solaris.c storage/innodb_plugin/ut/ut0auxconf_have_solaris_atomics.c storage/innodb_plugin/ut/ut0auxconf_pause.c storage/innodb_plugin/ut/ut0auxconf_sizeof_pthread_t.c storage/innodb_plugin/ut/ut0byte.c storage/innodb_plugin/ut/ut0dbg.c storage/innodb_plugin/ut/ut0list.c storage/innodb_plugin/ut/ut0mem.c storage/innodb_plugin/ut/ut0rnd.c storage/innodb_plugin/ut/ut0ut.c storage/innodb_plugin/ut/ut0vec.c storage/innodb_plugin/ut/ut0wqueue.c storage/innodb_plugin/win-plugin/ storage/innodb_plugin/win-plugin/README storage/innodb_plugin/win-plugin/win-plugin.diff storage/mysql_storage_engine.cmake win/create_def_file.js modified: BUILD/SETUP.sh BUILD/check-cpu CMakeLists.txt Docs/INSTALL-BINARY INSTALL-SOURCE INSTALL-WIN-SOURCE README client/Makefile.am client/mysql.cc client/mysql_upgrade.c client/mysqladmin.cc client/mysqlbinlog.cc client/mysqlcheck.c client/mysqldump.c client/mysqlimport.c client/mysqlshow.c client/mysqlslap.c client/mysqltest.cc cmd-line-utils/libedit/readline/readline.h cmd-line-utils/libedit/term.c cmd-line-utils/readline/Makefile.am cmd-line-utils/readline/bind.c cmd-line-utils/readline/complete.c cmd-line-utils/readline/display.c cmd-line-utils/readline/histexpand.c cmd-line-utils/readline/histfile.c cmd-line-utils/readline/history.h cmd-line-utils/readline/input.c cmd-line-utils/readline/isearch.c cmd-line-utils/readline/kill.c cmd-line-utils/readline/macro.c cmd-line-utils/readline/mbutil.c cmd-line-utils/readline/misc.c cmd-line-utils/readline/nls.c cmd-line-utils/readline/readline.h cmd-line-utils/readline/rlprivate.h cmd-line-utils/readline/rltty.c cmd-line-utils/readline/search.c cmd-line-utils/readline/terminal.c cmd-line-utils/readline/text.c cmd-line-utils/readline/tilde.c cmd-line-utils/readline/undo.c cmd-line-utils/readline/util.c cmd-line-utils/readline/vi_mode.c config/ac-macros/misc.m4 config/ac-macros/readline.m4 configure.in dbug/user.r extra/innochecksum.c extra/perror.c extra/yassl/src/handshake.cpp extra/yassl/taocrypt/include/modes.hpp extra/yassl/taocrypt/src/asn.cpp include/config-netware.h include/config-win.h include/hash.h include/m_ctype.h include/my_base.h include/my_global.h include/my_sys.h include/myisamchk.h include/myisammrg.h include/mysql/plugin.h include/thr_lock.h include/violite.h libmysql/CMakeLists.txt libmysql/Makefile.am libmysql/Makefile.shared libmysqld/CMakeLists.txt libmysqld/Makefile.am libmysqld/emb_qcache.h libmysqld/lib_sql.cc man/Makefile.am man/comp_err.1 man/innochecksum.1 man/make_win_bin_dist.1 man/msql2mysql.1 man/my_print_defaults.1 man/myisam_ftdump.1 man/myisamchk.1 man/myisamlog.1 man/myisampack.1 man/mysql-stress-test.pl.1 man/mysql-test-run.pl.1 man/mysql.1 man/mysql.server.1 man/mysql_client_test.1 man/mysql_config.1 man/mysql_convert_table_format.1 man/mysql_find_rows.1 man/mysql_fix_extensions.1 man/mysql_fix_privilege_tables.1 man/mysql_install_db.1 man/mysql_secure_installation.1 man/mysql_setpermission.1 man/mysql_tzinfo_to_sql.1 man/mysql_upgrade.1 man/mysql_waitpid.1 man/mysql_zap.1 man/mysqlaccess.1 man/mysqladmin.1 man/mysqlbinlog.1 man/mysqlbug.1 man/mysqlcheck.1 man/mysqld.8 man/mysqld_multi.1 man/mysqld_safe.1 man/mysqldump.1 man/mysqldumpslow.1 man/mysqlhotcopy.1 man/mysqlimport.1 man/mysqlmanager.8 man/mysqlshow.1 man/mysqlslap.1 man/mysqltest.1 man/ndbd.8 man/ndbd_redo_log_reader.1 man/ndbmtd.8 man/perror.1 man/replace.1 man/resolve_stack_dump.1 man/resolveip.1 mysql-test/Makefile.am mysql-test/collections/default.daily mysql-test/collections/default.experimental mysql-test/collections/default.push mysql-test/extra/binlog_tests/binlog.test mysql-test/extra/rpl_tests/rpl_deadlock.test mysql-test/extra/rpl_tests/rpl_reset_slave.test mysql-test/include/commit.inc mysql-test/include/concurrent.inc mysql-test/include/grant_cache.inc mysql-test/include/handler.inc mysql-test/include/index_merge1.inc mysql-test/include/mix1.inc mysql-test/include/mtr_check.sql mysql-test/include/mtr_warnings.sql mysql-test/include/query_cache.inc mysql-test/lib/My/CoreDump.pm mysql-test/lib/My/File/Path.pm mysql-test/lib/My/SafeProcess.pm mysql-test/lib/My/SafeProcess/Base.pm mysql-test/lib/My/SafeProcess/Makefile.am mysql-test/lib/My/SafeProcess/safe_process.cc mysql-test/lib/My/SafeProcess/safe_process_win.cc mysql-test/lib/mtr_cases.pm mysql-test/lib/mtr_process.pl mysql-test/lib/mtr_report.pm mysql-test/lib/mtr_unique.pm mysql-test/mysql-test-run.pl mysql-test/r/cast.result mysql-test/r/commit_1innodb.result mysql-test/r/concurrent_innodb_safelog.result mysql-test/r/concurrent_innodb_unsafelog.result mysql-test/r/consistent_snapshot.result mysql-test/r/count_distinct3.result mysql-test/r/create.result mysql-test/r/ctype_cp932_binlog_row.result mysql-test/r/ctype_cp932_binlog_stm.result mysql-test/r/ctype_euckr.result mysql-test/r/ctype_ldml.result mysql-test/r/ctype_recoding.result mysql-test/r/ctype_sjis.result mysql-test/r/ddl_i18n_koi8r.result mysql-test/r/ddl_i18n_utf8.result mysql-test/r/derived.result mysql-test/r/distinct.result mysql-test/r/fulltext.result mysql-test/r/func_compress.result mysql-test/r/func_concat.result mysql-test/r/func_crypt.result mysql-test/r/func_des_encrypt.result mysql-test/r/func_encrypt.result mysql-test/r/func_in.result mysql-test/r/func_math.result mysql-test/r/func_misc.result mysql-test/r/func_set.result mysql-test/r/func_str.result mysql-test/r/gis-rtree.result mysql-test/r/gis.result mysql-test/r/grant.result mysql-test/r/grant_cache_no_prot.result mysql-test/r/grant_cache_ps_prot.result mysql-test/r/group_min_max.result mysql-test/r/handler_innodb.result mysql-test/r/handler_myisam.result mysql-test/r/heap_btree.result mysql-test/r/index_merge_myisam.result mysql-test/r/information_schema.result mysql-test/r/information_schema_db.result mysql-test/r/init_file.result mysql-test/r/innodb-semi-consistent.result mysql-test/r/innodb.result mysql-test/r/innodb_mysql.result mysql-test/r/insert.result mysql-test/r/insert_select.result mysql-test/r/lock_multi.result mysql-test/r/merge.result mysql-test/r/myisam.result mysql-test/r/myisampack.result mysql-test/r/mysql.result mysql-test/r/mysqlbinlog.result mysql-test/r/mysqlbinlog_row_big.result mysql-test/r/mysqlcheck.result mysql-test/r/mysqldump.result mysql-test/r/mysqltest.result mysql-test/r/not_embedded_server.result mysql-test/r/openssl_1.result mysql-test/r/order_by.result mysql-test/r/outfile_loaddata.result mysql-test/r/parser.result mysql-test/r/partition.result mysql-test/r/partition_csv.result mysql-test/r/partition_mgm.result mysql-test/r/ps_1general.result mysql-test/r/query_cache_debug.result mysql-test/r/repair.result mysql-test/r/select.result mysql-test/r/shm.result mysql-test/r/sp-error.result mysql-test/r/sp.result mysql-test/r/sp_notembedded.result mysql-test/r/sql_mode.result mysql-test/r/status.result mysql-test/r/subselect.result mysql-test/r/subselect3.result mysql-test/r/table_elim.result mysql-test/r/trigger.result mysql-test/r/trigger_notembedded.result mysql-test/r/type_newdecimal.result mysql-test/r/type_time.result mysql-test/r/union.result mysql-test/r/upgrade.result mysql-test/r/user_var.result mysql-test/r/varbinary.result mysql-test/r/variables-notembedded.result mysql-test/r/variables.result mysql-test/r/view.result mysql-test/r/xa.result mysql-test/r/xml.result mysql-test/std_data/init_file.dat mysql-test/suite/binlog/r/binlog_database.result mysql-test/suite/binlog/r/binlog_innodb.result mysql-test/suite/binlog/r/binlog_innodb_row.result mysql-test/suite/binlog/r/binlog_multi_engine.result mysql-test/suite/binlog/r/binlog_row_binlog.result mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result mysql-test/suite/binlog/r/binlog_row_insert_select.result mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result mysql-test/suite/binlog/r/binlog_stm_binlog.result mysql-test/suite/binlog/r/binlog_stm_blackhole.result mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result mysql-test/suite/binlog/r/binlog_stm_ps.result mysql-test/suite/binlog/r/binlog_stm_row.result mysql-test/suite/binlog/r/binlog_unsafe.result mysql-test/suite/binlog/t/binlog_unsafe.test mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc mysql-test/suite/funcs_1/datadict/is_routines.inc mysql-test/suite/funcs_1/datadict/is_schemata.inc mysql-test/suite/funcs_1/datadict/is_tables.inc mysql-test/suite/funcs_1/datadict/is_triggers.inc mysql-test/suite/funcs_1/datadict/is_views.inc mysql-test/suite/funcs_1/datadict/processlist_priv.inc mysql-test/suite/funcs_1/datadict/statistics.inc mysql-test/suite/funcs_1/datadict/table_constraints.inc mysql-test/suite/funcs_1/datadict/tables.inc mysql-test/suite/funcs_1/datadict/tables1.inc mysql-test/suite/funcs_1/r/is_columns_is_embedded.result mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result mysql-test/suite/funcs_1/r/is_routines.result mysql-test/suite/funcs_1/r/storedproc.result mysql-test/suite/funcs_1/storedproc/storedproc_06.inc mysql-test/suite/funcs_1/storedproc/storedproc_10.inc mysql-test/suite/funcs_1/t/disabled.def mysql-test/suite/funcs_1/t/is_basics_mixed.test mysql-test/suite/funcs_1/t/is_column_privileges.test mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test mysql-test/suite/funcs_1/t/is_columns.test mysql-test/suite/funcs_1/t/is_schema_privileges.test mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test mysql-test/suite/funcs_1/t/is_statistics.test mysql-test/suite/funcs_1/t/is_table_constraints.test mysql-test/suite/funcs_1/t/is_table_privileges.test mysql-test/suite/funcs_1/t/is_user_privileges.test mysql-test/suite/funcs_1/t/myisam_views.test mysql-test/suite/funcs_1/t/storedproc.test mysql-test/suite/funcs_1/triggers/triggers_03.inc mysql-test/suite/funcs_1/triggers/triggers_03e_columns.inc mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc mysql-test/suite/funcs_1/triggers/triggers_03e_db_table_mix.inc mysql-test/suite/funcs_1/triggers/triggers_03e_definer.inc mysql-test/suite/funcs_1/triggers/triggers_03e_global_db_mix.inc mysql-test/suite/funcs_1/triggers/triggers_03e_prepare.inc mysql-test/suite/funcs_1/triggers/triggers_03e_table_level.inc mysql-test/suite/funcs_1/triggers/triggers_03e_transaction.inc mysql-test/suite/funcs_1/triggers/triggers_0407.inc mysql-test/suite/funcs_1/triggers/triggers_08.inc mysql-test/suite/funcs_2/charset/charset_master.test mysql-test/suite/maria/r/maria3.result mysql-test/suite/ndb/my.cnf mysql-test/suite/ndb/r/ndb_binlog_format.result mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result mysql-test/suite/parts/r/partition_auto_increment_memory.result mysql-test/suite/parts/r/partition_auto_increment_myisam.result mysql-test/suite/parts/r/partition_syntax_innodb.result mysql-test/suite/parts/r/partition_syntax_myisam.result mysql-test/suite/rpl/include/rpl_mixed_ddl.inc mysql-test/suite/rpl/r/rpl_binlog_grant.result mysql-test/suite/rpl/r/rpl_bug33931.result mysql-test/suite/rpl/r/rpl_deadlock_innodb.result mysql-test/suite/rpl/r/rpl_idempotency.result mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result mysql-test/suite/rpl/r/rpl_row_create_table.result mysql-test/suite/rpl/r/rpl_row_log.result mysql-test/suite/rpl/r/rpl_row_log_innodb.result mysql-test/suite/rpl/r/rpl_row_reset_slave.result mysql-test/suite/rpl/r/rpl_sf.result mysql-test/suite/rpl/r/rpl_skip_error.result mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result mysql-test/suite/rpl/r/rpl_slave_skip.result mysql-test/suite/rpl/r/rpl_start_stop_slave.result mysql-test/suite/rpl/r/rpl_stm_loadfile.result mysql-test/suite/rpl/r/rpl_stm_reset_slave.result mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result mysql-test/suite/rpl/r/rpl_temporary.result mysql-test/suite/rpl/r/rpl_udf.result mysql-test/suite/rpl/t/disabled.def mysql-test/suite/rpl/t/rpl_binlog_corruption.test mysql-test/suite/rpl/t/rpl_bug33931.test mysql-test/suite/rpl/t/rpl_do_grant.test mysql-test/suite/rpl/t/rpl_idempotency.test mysql-test/suite/rpl/t/rpl_incident.test mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test mysql-test/suite/rpl/t/rpl_sf.test mysql-test/suite/rpl/t/rpl_skip_error.test mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test mysql-test/suite/rpl/t/rpl_sp.test mysql-test/suite/rpl/t/rpl_start_stop_slave.test mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test mysql-test/suite/rpl/t/rpl_temporary.test mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result mysql-test/suite/rpl_ndb/t/disabled.def mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result mysql-test/suite/sys_vars/r/innodb_data_home_dir_basic.result mysql-test/suite/sys_vars/r/innodb_flush_method_basic.result mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result mysql-test/suite/sys_vars/r/log_warnings_basic_64.result mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_64.result mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result mysql-test/suite/sys_vars/r/max_heap_table_size_basic_64.result mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result mysql-test/suite/sys_vars/r/query_prealloc_size_basic_64.result mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result mysql-test/suite/sys_vars/r/rpl_init_slave_func.result mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result mysql-test/suite/sys_vars/r/ssl_capath_basic.result mysql-test/suite/sys_vars/r/ssl_cipher_basic.result mysql-test/suite/sys_vars/r/sync_binlog_basic_64.result mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result mysql-test/suite/sys_vars/r/wait_timeout_basic_64.result mysql-test/suite/sys_vars/t/innodb_data_home_dir_basic.test mysql-test/suite/sys_vars/t/innodb_flush_method_basic.test mysql-test/suite/sys_vars/t/ssl_capath_basic.test mysql-test/suite/sys_vars/t/ssl_cipher_basic.test mysql-test/t/archive_bitfield.test mysql-test/t/cast.test mysql-test/t/client_xml.test mysql-test/t/connect.test mysql-test/t/consistent_snapshot.test mysql-test/t/count_distinct3.test mysql-test/t/create.test mysql-test/t/csv.test mysql-test/t/ctype_cp932_binlog_stm.test mysql-test/t/ctype_euckr.test mysql-test/t/ctype_ldml.test mysql-test/t/ctype_sjis.test mysql-test/t/ddl_i18n_koi8r.test mysql-test/t/ddl_i18n_utf8.test mysql-test/t/derived.test mysql-test/t/disabled.def mysql-test/t/drop.test mysql-test/t/events_grant.test mysql-test/t/events_stress.test mysql-test/t/events_trans_notembedded.test mysql-test/t/fix_priv_tables.test mysql-test/t/flush.test mysql-test/t/fulltext.test mysql-test/t/func_compress.test mysql-test/t/func_concat.test mysql-test/t/func_crypt.test mysql-test/t/func_des_encrypt.test mysql-test/t/func_encrypt.test mysql-test/t/func_in.test mysql-test/t/func_math.test mysql-test/t/func_misc.test mysql-test/t/func_set.test mysql-test/t/func_str.test mysql-test/t/gis-rtree.test mysql-test/t/gis.test mysql-test/t/grant.test mysql-test/t/group_min_max.test mysql-test/t/heap_btree.test mysql-test/t/information_schema.test mysql-test/t/information_schema_db.test mysql-test/t/init_file.test mysql-test/t/innodb-semi-consistent.test mysql-test/t/innodb-use-sys-malloc.test mysql-test/t/innodb.test mysql-test/t/innodb_mysql.test mysql-test/t/innodb_notembedded.test mysql-test/t/innodb_xtradb_bug317074.test mysql-test/t/insert.test mysql-test/t/insert_select.test mysql-test/t/lock_multi.test mysql-test/t/lowercase_fs_off.test mysql-test/t/merge.test mysql-test/t/multi_update2.test mysql-test/t/myisam.test mysql-test/t/myisampack.test mysql-test/t/mysql.test mysql-test/t/mysql_upgrade.test mysql-test/t/mysqlbinlog.test mysql-test/t/mysqlbinlog_row_big.test mysql-test/t/mysqlcheck.test mysql-test/t/mysqldump.test mysql-test/t/mysqltest.test mysql-test/t/not_embedded_server.test mysql-test/t/openssl_1.test mysql-test/t/order_by.test mysql-test/t/outfile_loaddata.test mysql-test/t/parser.test mysql-test/t/partition.test mysql-test/t/partition_csv.test mysql-test/t/partition_mgm.test mysql-test/t/plugin.test mysql-test/t/plugin_load-master.opt mysql-test/t/ps_1general.test mysql-test/t/query_cache_debug.test mysql-test/t/select.test mysql-test/t/shm.test mysql-test/t/sp-error.test mysql-test/t/sp.test mysql-test/t/sp_notembedded.test mysql-test/t/sp_trans_log.test mysql-test/t/sql_mode.test mysql-test/t/status.test mysql-test/t/subselect.test mysql-test/t/subselect3.test mysql-test/t/table_elim.test mysql-test/t/trigger.test mysql-test/t/trigger_notembedded.test mysql-test/t/type_newdecimal.test mysql-test/t/type_time.test mysql-test/t/union.test mysql-test/t/upgrade.test mysql-test/t/user_var.test mysql-test/t/variables-big.test mysql-test/t/variables-notembedded-master.opt mysql-test/t/variables.test mysql-test/t/view.test mysql-test/t/xa.test mysql-test/t/xml.test mysql-test/valgrind.supp mysys/Makefile.am mysys/array.c mysys/charset.c mysys/hash.c mysys/mf_format.c mysys/mf_getdate.c mysys/mf_iocache2.c mysys/mf_keycache.c mysys/my_getopt.c mysys/my_handler_errors.h mysys/my_init.c scripts/fill_help_tables.sql scripts/make_binary_distribution.sh scripts/make_win_bin_dist scripts/mysql_convert_table_format.sh scripts/mysql_find_rows.sh scripts/mysql_fix_extensions.sh scripts/mysql_setpermission.sh scripts/mysql_zap.sh scripts/mysqlaccess.sh scripts/mysqld_multi.sh scripts/mysqld_safe.sh scripts/mysqldumpslow.sh scripts/mysqlhotcopy.sh sql-bench/README* sql-bench/as3ap.sh sql-bench/bench-count-distinct.sh sql-bench/bench-init.pl.sh sql-bench/compare-results.sh sql-bench/copy-db.sh sql-bench/crash-me.sh sql-bench/innotest1.sh sql-bench/innotest1a.sh sql-bench/innotest1b.sh sql-bench/innotest2.sh sql-bench/innotest2a.sh sql-bench/innotest2b.sh sql-bench/run-all-tests.sh sql-bench/server-cfg.sh sql-bench/test-ATIS.sh sql-bench/test-alter-table.sh sql-bench/test-big-tables.sh sql-bench/test-connect.sh sql-bench/test-create.sh sql-bench/test-insert.sh sql-bench/test-select.sh sql-bench/test-transactions.sh sql-bench/test-wisconsin.sh sql-common/client.c sql/CMakeLists.txt sql/Makefile.am sql/event_data_objects.cc sql/event_scheduler.cc sql/events.cc sql/field.cc sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_partition.cc sql/handler.cc sql/handler.h sql/item.cc sql/item.h sql/item_func.cc sql/item_func.h sql/item_geofunc.cc sql/item_strfunc.cc sql/item_strfunc.h sql/item_subselect.cc sql/item_sum.cc sql/item_xmlfunc.cc sql/lex.h sql/log.cc sql/log.h sql/log_event.cc sql/log_event.h sql/my_decimal.h sql/mysql_priv.h sql/mysqld.cc sql/net_serv.cc sql/opt_range.cc sql/opt_table_elimination.cc sql/parse_file.cc sql/parse_file.h sql/password.c sql/protocol.cc sql/protocol.h sql/rpl_filter.cc sql/rpl_reporting.cc sql/rpl_reporting.h sql/rpl_rli.cc sql/scheduler.cc sql/set_var.cc sql/share/errmsg.txt sql/slave.cc sql/slave.h sql/sp.cc sql/sp.h sql/sp_head.cc sql/sp_head.h sql/sp_pcontext.cc sql/sp_pcontext.h sql/spatial.h sql/sql_acl.cc sql/sql_acl.h sql/sql_base.cc sql/sql_cache.cc sql/sql_cache.h sql/sql_class.cc sql/sql_class.h sql/sql_connect.cc sql/sql_crypt.cc sql/sql_crypt.h sql/sql_db.cc sql/sql_delete.cc sql/sql_derived.cc sql/sql_handler.cc sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_list.h sql/sql_load.cc sql/sql_parse.cc sql/sql_partition.cc sql/sql_plugin.cc sql/sql_plugin.h sql/sql_prepare.cc sql/sql_rename.cc sql/sql_repl.cc sql/sql_select.cc sql/sql_show.cc sql/sql_string.cc sql/sql_string.h sql/sql_table.cc sql/sql_test.cc sql/sql_union.cc sql/sql_update.cc sql/sql_view.cc sql/sql_view.h sql/sql_yacc.yy sql/structs.h sql/table.cc sql/table.h sql/thr_malloc.cc sql/unireg.cc sql/unireg.h storage/Makefile.am storage/archive/CMakeLists.txt storage/archive/ha_archive.cc storage/blackhole/CMakeLists.txt storage/csv/CMakeLists.txt storage/example/CMakeLists.txt storage/federated/CMakeLists.txt storage/federated/ha_federated.cc storage/heap/CMakeLists.txt storage/heap/ha_heap.cc storage/heap/ha_heap.h storage/ibmdb2i/db2i_charsetSupport.cc storage/ibmdb2i/db2i_collationSupport.cc storage/ibmdb2i/db2i_conversion.cc storage/ibmdb2i/db2i_errors.cc storage/ibmdb2i/db2i_errors.h storage/ibmdb2i/db2i_misc.h storage/ibmdb2i/db2i_myconv.h storage/ibmdb2i/db2i_rir.cc storage/ibmdb2i/ha_ibmdb2i.cc storage/ibmdb2i/ha_ibmdb2i.h storage/innobase/CMakeLists.txt storage/innobase/Makefile.am storage/innobase/btr/btr0cur.c storage/innobase/dict/dict0dict.c storage/innobase/fil/fil0fil.c storage/innobase/handler/ha_innodb.cc storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/fsp0fsp.h storage/innobase/include/mtr0log.ic storage/innobase/include/row0mysql.h storage/innobase/include/srv0srv.h storage/innobase/include/trx0rseg.ic storage/innobase/include/trx0sys.h storage/innobase/include/trx0sys.ic storage/innobase/include/trx0trx.h storage/innobase/include/trx0trx.ic storage/innobase/lock/lock0lock.c storage/innobase/page/page0cur.c storage/innobase/row/row0mysql.c storage/innobase/row/row0sel.c storage/innobase/srv/srv0srv.c storage/innobase/trx/trx0purge.c storage/innobase/trx/trx0rec.c storage/innobase/trx/trx0sys.c storage/innobase/trx/trx0trx.c storage/innobase/trx/trx0undo.c storage/maria/CMakeLists.txt storage/maria/ha_maria.cc storage/myisam/CMakeLists.txt* storage/myisam/ft_boolean_search.c storage/myisam/ha_myisam.cc storage/myisam/ha_myisam.h storage/myisam/mi_close.c storage/myisam/mi_delete.c storage/myisam/mi_dynrec.c storage/myisam/mi_open.c storage/myisam/mi_packrec.c storage/myisam/mi_write.c storage/myisam/myisamchk.c storage/myisammrg/CMakeLists.txt storage/myisammrg/ha_myisammrg.cc storage/myisammrg/ha_myisammrg.h storage/myisammrg/myrg_info.c storage/myisammrg/myrg_open.c storage/ndb/src/kernel/blocks/backup/read.cpp storage/ndb/src/mgmsrv/Makefile.am storage/ndb/test/run-test/Makefile.am storage/ndb/tools/restore/consumer_restore.cpp storage/ndb/tools/restore/consumer_restorem.cpp storage/xtradb/CMakeLists.txt storage/xtradb/btr/btr0cur.c storage/xtradb/buf/buf0flu.c storage/xtradb/handler/ha_innodb.cc storage/xtradb/handler/handler0vars.h storage/xtradb/handler/i_s.cc storage/xtradb/include/row0mysql.h storage/xtradb/include/srv0srv.h storage/xtradb/include/trx0trx.h storage/xtradb/include/trx0trx.ic storage/xtradb/lock/lock0lock.c storage/xtradb/plug.in storage/xtradb/row/row0mysql.c storage/xtradb/row/row0sel.c storage/xtradb/srv/srv0srv.c storage/xtradb/srv/srv0start.c storage/xtradb/trx/trx0trx.c strings/ctype-cp932.c strings/ctype-euc_kr.c strings/ctype-sjis.c strings/ctype-uca.c strings/decimal.c support-files/build-tags support-files/my-huge.cnf.sh support-files/my-innodb-heavy-4G.cnf.sh support-files/my-large.cnf.sh support-files/my-medium.cnf.sh support-files/my-small.cnf.sh support-files/mysql.server.sh support-files/mysql.spec.sh tests/Makefile.am tests/grant.pl* tests/mysql_client_test.c vio/viosocket.c vio/viosslfactories.c win/Makefile.am win/configure.js The size of the diff (353877 lines) is larger than your specified limit of 5000 lines -- lp:maria https://code.launchpad.net/~maria-captains/maria/5.1 Your team Maria developers is subscribed to branch lp:maria. To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.

1 0