#At file:///work2/5.1/mysql-5.1-bugteam-push/
------------------------------------------------------------
revno: 2742
revision-id: matthias.leich@stripped
parent: matthias.leich@stripped
parent: azundris@stripped
committer: Matthias Leich <Matthias.Leich@stripped>
branch nick: mysql-5.1-bugteam-push
timestamp: Do 2008-09-18 15:05:19 +0200
message:
Merge actual bugteam tree -> local tree
added:
mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result mysqltestsuitebinlog-20080908201825-i6zylwbc64c5pb8p-1
mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test mysqltestsuitebinlog-20080908201825-i6zylwbc64c5pb8p-2
modified:
mysql-test/extra/binlog_tests/innodb_stat.test sp1f-innodb_stat.test-20051222053450-nkj6khpta7xrj2axzcb3l4rfgvgqfrp2
mysql-test/r/loaddata.result sp1f-loaddata.result-20030505115238-y53yqooyomv7c43r2heznierboaww576
mysql-test/suite/binlog/r/binlog_row_innodb_stat.result sp1f-binlog_row_innodb_st-20051222053451-i5jdnhcf4ikw2cb2xbvbha7zwh5iwfyn
mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result sp1f-binlog_stm_innodb_st-20051222053451-s2jxwdb3tbz6lg6qvsf5vjycdq6tvj5x
mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test sp1f-binlog_stm_innodb_st-20051222053459-o3cq2o7wz4qp6ncicmvfqz3kjqfe4eab
mysql-test/t/loaddata.test sp1f-loaddata.test-20030505115238-2kz3yrlkdadbbcxdc3cncvt7ofzo2ln5
sql/sql_class.cc sp1f-sql_class.cc-19700101030959-rpotnweaff2pikkozh3butrf7mv3oero
sql/sql_class.h sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s
sql/sql_load.cc sp1f-sql_load.cc-19700101030959-hoqlay5we4yslrw23xqedulkejw6a3o5
------------------------------------------------------------
revno: 2738.2.4
revision-id: azundris@stripped
parent: azundris@stripped
parent: chad@stripped
committer: Tatiana A. Nurnberg <azundris@stripped>
branch nick: 51-37114
timestamp: Do 2008-09-18 13:15:19 +0200
message:
auto-merge
added:
mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result mysqltestsuitebinlog-20080908201825-i6zylwbc64c5pb8p-1
mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test mysqltestsuitebinlog-20080908201825-i6zylwbc64c5pb8p-2
modified:
mysql-test/extra/binlog_tests/innodb_stat.test sp1f-innodb_stat.test-20051222053450-nkj6khpta7xrj2axzcb3l4rfgvgqfrp2
mysql-test/suite/binlog/r/binlog_row_innodb_stat.result sp1f-binlog_row_innodb_st-20051222053451-i5jdnhcf4ikw2cb2xbvbha7zwh5iwfyn
mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result sp1f-binlog_stm_innodb_st-20051222053451-s2jxwdb3tbz6lg6qvsf5vjycdq6tvj5x
mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test sp1f-binlog_stm_innodb_st-20051222053459-o3cq2o7wz4qp6ncicmvfqz3kjqfe4eab
------------------------------------------------------------
revno: 2738.3.1
revision-id: chad@stripped
parent: azundris@stripped
parent: chad@stripped
committer: Chad MILLER <chad@stripped>
branch nick: 5.1-bugteam
timestamp: Do 2008-09-18 03:57:59 -0400
message:
Merge Bug#37312.
added:
mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result mysqltestsuitebinlog-20080908201825-i6zylwbc64c5pb8p-1
mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test mysqltestsuitebinlog-20080908201825-i6zylwbc64c5pb8p-2
modified:
mysql-test/extra/binlog_tests/innodb_stat.test sp1f-innodb_stat.test-20051222053450-nkj6khpta7xrj2axzcb3l4rfgvgqfrp2
mysql-test/suite/binlog/r/binlog_row_innodb_stat.result sp1f-binlog_row_innodb_st-20051222053451-i5jdnhcf4ikw2cb2xbvbha7zwh5iwfyn
mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result sp1f-binlog_stm_innodb_st-20051222053451-s2jxwdb3tbz6lg6qvsf5vjycdq6tvj5x
mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test sp1f-binlog_stm_innodb_st-20051222053459-o3cq2o7wz4qp6ncicmvfqz3kjqfe4eab
------------------------------------------------------------
revno: 2732.1.1
revision-id: chad@stripped
parent: msvensson@stripped
committer: Chad MILLER <chad@stripped>
branch nick: 5.1-bugteam--bug37312
timestamp: Mo 2008-09-08 16:23:55 -0400
message:
Bug#37312: Make test binlog_{row,stm}_innodb_stat more robust
The size of the Innodb_buffer_pool_pages differs by one byte on row versus statement
log, so neuter the last position of the stringified decimal representation. Innobase
says the size isn't very important in any case.
Also, split out the "mixed" format to its own file, as mtr seems to dislike having only
stm and row but not mix.
added:
mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result mysqltestsuitebinlog-20080908201825-i6zylwbc64c5pb8p-1
mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test mysqltestsuitebinlog-20080908201825-i6zylwbc64c5pb8p-2
modified:
mysql-test/extra/binlog_tests/innodb_stat.test sp1f-innodb_stat.test-20051222053450-nkj6khpta7xrj2axzcb3l4rfgvgqfrp2
mysql-test/suite/binlog/r/binlog_row_innodb_stat.result sp1f-binlog_row_innodb_st-20051222053451-i5jdnhcf4ikw2cb2xbvbha7zwh5iwfyn
mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result sp1f-binlog_stm_innodb_st-20051222053451-s2jxwdb3tbz6lg6qvsf5vjycdq6tvj5x
mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test sp1f-binlog_stm_innodb_st-20051222053459-o3cq2o7wz4qp6ncicmvfqz3kjqfe4eab
------------------------------------------------------------
revno: 2738.2.3
revision-id: azundris@stripped
parent: azundris@stripped
parent: azundris@stripped
committer: Tatiana A. Nurnberg <azundris@stripped>
branch nick: 51-37114
timestamp: Do 2008-09-18 11:32:54 +0200
message:
manual merge
modified:
mysql-test/r/loaddata.result sp1f-loaddata.result-20030505115238-y53yqooyomv7c43r2heznierboaww576
mysql-test/t/loaddata.test sp1f-loaddata.test-20030505115238-2kz3yrlkdadbbcxdc3cncvt7ofzo2ln5
------------------------------------------------------------
revno: 1810.3771.3
revision-id: azundris@stripped
parent: azundris@stripped
committer: Tatiana A. Nurnberg <azundris@stripped>
branch nick: 50-37114
timestamp: Do 2008-09-18 11:24:50 +0200
message:
Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DATA Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DATA INFILE
tweaked test to make embedded server happy
modified:
mysql-test/r/loaddata.result sp1f-loaddata.result-20030505115238-y53yqooyomv7c43r2heznierboaww576
mysql-test/t/loaddata.test sp1f-loaddata.test-20030505115238-2kz3yrlkdadbbcxdc3cncvt7ofzo2ln5
------------------------------------------------------------
revno: 1810.3771.2
revision-id: azundris@stripped
parent: azundris@stripped
parent: vvaintroub@stripped
committer: Tatiana A. Nurnberg <azundris@stripped>
branch nick: 50-37114
timestamp: Mi 2008-09-17 17:44:15 +0200
message:
auto-merge
modified:
sql/stacktrace.c sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq
------------------------------------------------------------
revno: 2738.2.2
revision-id: azundris@stripped
parent: azundris@stripped
parent: v.narayanan@stripped
committer: Tatiana A. Nurnberg <azundris@stripped>
branch nick: 51-37114
timestamp: Mi 2008-09-17 18:12:23 +0200
message:
auto-merge
modified:
mysql-test/r/auto_increment.result sp1f-auto_increment.resul-20001228015632-kbskyr7q5v4v323qyj46kh6yldhp6rys
mysql-test/t/auto_increment.test sp1f-auto_increment.test-20001228015635-ev7zqhf36ny5k74jamyiyumxh66snmz6
mysys/stacktrace.c sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq
sql/sql_insert.cc sp1f-sql_insert.cc-19700101030959-xgwqe5svnimxudzdcuitauljzz2zjk5g
------------------------------------------------------------
revno: 2738.2.1
revision-id: azundris@stripped
parent: kpettersson@stripped
parent: azundris@stripped
committer: Tatiana A. Nurnberg <azundris@stripped>
branch nick: 51-37114
timestamp: Mi 2008-09-17 14:54:50 +0200
message:
auto-merge
modified:
mysql-test/r/loaddata.result sp1f-loaddata.result-20030505115238-y53yqooyomv7c43r2heznierboaww576
mysql-test/t/loaddata.test sp1f-loaddata.test-20030505115238-2kz3yrlkdadbbcxdc3cncvt7ofzo2ln5
sql/sql_class.cc sp1f-sql_class.cc-19700101030959-rpotnweaff2pikkozh3butrf7mv3oero
sql/sql_class.h sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s
sql/sql_load.cc sp1f-sql_load.cc-19700101030959-hoqlay5we4yslrw23xqedulkejw6a3o5
------------------------------------------------------------
revno: 1810.3771.1
revision-id: azundris@stripped
parent: patrick.crews@stripped
committer: Tatiana A. Nurnberg <azundris@stripped>
branch nick: 50-37114
timestamp: Mi 2008-09-17 08:34:00 +0200
message:
Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DATA INFILE
NO_BACKSLASH_ESCAPES was not heeded in LOAD DATA INFILE
and SELECT INTO OUTFILE. It is now.
modified:
mysql-test/r/loaddata.result sp1f-loaddata.result-20030505115238-y53yqooyomv7c43r2heznierboaww576
mysql-test/t/loaddata.test sp1f-loaddata.test-20030505115238-2kz3yrlkdadbbcxdc3cncvt7ofzo2ln5
sql/sql_class.cc sp1f-sql_class.cc-19700101030959-rpotnweaff2pikkozh3butrf7mv3oero
sql/sql_class.h sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s
sql/sql_load.cc sp1f-sql_load.cc-19700101030959-hoqlay5we4yslrw23xqedulkejw6a3o5
Attachment: [text/text/x-diff] patch-2742.diff
| Thread |
|---|
| • bzr commit into mysql-5.1 tree (Matthias.Leich:2742) Bug#37114, Bug#37312 | Matthias Leich | 18 Sep |
