summaryrefslogtreecommitdiff
path: root/mysql-test/extra
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-192-0/+20
|\
| * Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-152-0/+20
| |\
| | * BUG#49222: Mark RAND() as unsafeSven Sandberg2010-01-131-0/+6
| | * merge: 5.1-bugteam bug branch --> 5.1 bugteam latest.Luis Soares2010-01-071-0/+14
| | |\
| | | * BUG#49479: Slave stops with syntax error: LOAD DATA event without Luis Soares2009-12-061-0/+14
* | | | Manual merge from next-mr.unknown2010-01-121-3/+1
|\ \ \ \
| * | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-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
* | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-21/+39
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-161-21/+39
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Bug #34628 LOAD DATA CONCURRENT INFILE drops CONCURRENT in binary logunknown2009-12-151-21/+39
| | | |_|/ / / / / / | | |/| | | | | | |
* | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-17/+16
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-116-10/+159
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | merge 5.1-bugteam (local) --> 5.1-bugteamAlfranio Correia2009-11-213-35/+416
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | BUG#48091 valgrind errors when slave has double not null and master has doubl...Alfranio Correia2009-10-221-37/+40
| | * | | | | | | | | BUG#48091 valgrind errors when slave has double not null and master has doubl...Alfranio Correia2009-10-221-18/+18
| | * | | | | | | | | BUG#48091 valgrind errors when slave has double not null and master has doubl...Alfranio Correia2009-10-221-0/+364
| | * | | | | | | | | BUG#48091 valgrind errors when slave has double not null and master has doubl...Alfranio Correia2009-10-222-18/+32
| * | | | | | | | | | BUG#47995: Mark system functions as unsafeSven Sandberg2009-11-181-17/+16
* | | | | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-027-40/+27
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-303-1/+72
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| * | | | | | | | | | WL#3894, post-push fix.Serge Kozlov2009-11-281-24/+13
| * | | | | | | | | | Backport for WL#4416Serge Kozlov2009-11-275-19/+12
| * | | | | | | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-131-0/+1
| |\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status