summaryrefslogtreecommitdiff
path: root/mysql-test/extra
Commit message (Expand)AuthorAgeFilesLines
* BUG#51894 Replication failure with SBR on DROP TEMPORARY TABLE inside aAlfranio Correia2010-04-204-31/+28
* auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixingAlfranio Correia2010-04-191-1/+1
|\
| * auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixingAlfranio Correia2010-03-311-1/+1
| |\
| | * BUG#51291 Unfortunate effect around variable binlog_direct_non_transactional_...Alfranio Correia2010-03-311-1/+1
* | | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-2431-849/+4528
|\ \ \ | |/ /
| * | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-241-0/+13
| |\ \ | | |/ | |/|
| * | Merge next-mr -> next-4284.Konstantin Osipov2010-02-067-51/+298
| |\ \
| | * \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-031-127/+0
| | |\ \
| | * | | Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing.Alexander Nozdrin2010-02-023-51/+33
| | * | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-311-0/+127
| | |\ \ \
| | * \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-311-0/+86
| | |\ \ \ \
| | * \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-301-0/+159
| | |\ \ \ \ \
| | * \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-192-0/+20
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-0525-806/+5032
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Manual merge from next-mr.unknown2010-01-121-3/+1
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-1/+145
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | BUG#49836: Replication of geometric fields is broken after WL#5151Luis Soares2009-12-241-1/+138
| | | * | | | | | | | merge mysql-5.1-rep+2 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-231-0/+7
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merging with mysql-5.1-rep+2Mats Kindahl2009-12-211-0/+7
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-211-0/+7
| | * | | | | | | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-0725-806/+4823
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | merge mysql-5.1-rep+2 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-211-0/+28
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | Merging with mysql.5.1-rep+2Mats Kindahl2009-12-181-17/+16
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merging with mysql-5.1-rep+2Mats Kindahl2009-12-181-0/+28
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | WL#5151: Conversion between different typesMats Kindahl2009-12-181-0/+28
| | | * | | | | | | | | | | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-1721-789/+3987
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | Post-push fixes after wrong merge from 5.1->rep+2->rep+3.Sven Sandberg2009-12-141-11/+11
| | | | * | | | | | | | | | merging 5.1->rep+2->rep+3Andrei Elkin2009-12-021-0/+8
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-3010-45/+101
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | | Post-fix for WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-132-10/+299
| | | | * | | | | | | | | | | Post-fix after mysql-5.1-rep+2 --> mysql-5.1-rep+3.Alfranio Correia2009-11-113-315/+178
| | | | * | | | | | | | | | | Post-fix for merge mysql-5.1-rep+2 --> mysql-5.1-rep+3Alfranio Correia2009-11-111-14/+8
| | | | * | | | | | | | | | | merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-1010-35/+675
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-0315-483/+3122
| | | | * | | | | | | | | | | | Manual merge 5.1-rep+2 to 5.1-rep+3He Zhenxing2009-10-1811-48/+581
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-304-5/+412
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-222-18/+54
| | | | | * | | | | | | | | | | | | Merged fix for BUG#39934 up a few revisions.Sven Sandberg2009-07-144-9/+380
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-144-9/+380
| | | * | | | | | | | | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Alfranio Correia2009-12-171-17/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merging with mysql-5.1-rep+2Mats Kindahl2009-12-154-11/+797
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | / / / / / / / / | | | | | |_|_|_|_|_|/ / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-144-11/+797
| * | | | | | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-3/+1
| | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-21/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-21/+39
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-17/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-17/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-027-40/+27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /