Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge 5.1 --> 5.1-rpl | Alfranio Correia | 2008-12-13 | 1 | -4/+4 |
|\ | |||||
| * | Bug#41002 - symlink.test fails on symlinked datadir | Ingo Struewing | 2008-11-25 | 1 | -4/+4 |
* | | merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-r... | Andrei Elkin | 2008-11-12 | 1 | -5/+5 |
|\ \ | |/ | |||||
| * | Merge from mysql-5.0-bugteam into mysql-5.1-bugteam | Davi Arnaut | 2008-10-24 | 1 | -5/+5 |
| |\ | |||||
| * | | Bug#36768 (partition_info::check_partition_info() reports mal formed | Marc Alff | 2008-10-06 | 1 | -5/+5 |
* | | | Merge 5.1 main -> 5.1-rpl | He Zhenxing | 2008-09-06 | 1 | -4/+0 |
|\ \ \ | |/ / | |||||
| * | | merging fix | Alexey Botchkov | 2008-08-26 | 1 | -4/+0 |
| |\ \ | | |/ | |||||
| | * | merging fixes | Alexey Botchkov | 2008-08-26 | 1 | -2/+0 |
| | * | test case fix | gluh@mysql.com/mgluh.(none) | 2008-03-03 | 1 | -4/+4 |
| | * | Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt | gluh@eagle.(none) | 2008-02-29 | 1 | -4/+4 |
| | |\ | |||||
| | | * | test fix | gluh@mysql.com/eagle.(none) | 2008-02-29 | 1 | -4/+4 |
| | * | | after merge fix | gluh@mysql.com/eagle.(none) | 2008-02-29 | 1 | -24/+23 |
| | * | | Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt | gluh@eagle.(none) | 2008-02-29 | 1 | -17/+21 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#32167 another privilege bypass with DATA/INDEX DIRECORY(ver 4.1,5.0) | gluh@mysql.com/eagle.(none) | 2008-02-29 | 1 | -17/+21 |
* | | | | Fix paths in test and result files | msvensson@pilot.mysql.com | 2008-04-03 | 1 | -4/+4 |
|/ / / | |||||
* | | | Merge stella.local:/home2/mydev/mysql-5.1-ateam | istruewing@stella.local | 2008-03-20 | 1 | -1/+13 |
|\ \ \ | |||||
| * | | | Bug#35305: partition_symlink test failures | mattiasj@witty. | 2008-03-17 | 1 | -3/+15 |
| * | | | Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/... | antony@pcg5ppc.xiphis.org | 2008-03-14 | 1 | -36/+27 |
| |\ \ \ | |||||
* | | | | | Post-merge fixes | istruewing@stella.local | 2008-03-14 | 1 | -4/+4 |
* | | | | | Post-merge fix. Moved the symlink handling from sql_parse.cc here. | istruewing@stella.local | 2008-03-14 | 1 | -2/+2 |
* | | | | | Manual merge | istruewing@stella.local | 2008-03-14 | 1 | -36/+27 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | fixed problem with embedded server | gluh@mysql.com/eagle.(none) | 2008-02-29 | 1 | -1/+1 |
| * | | | Bug#32167 another privilege bypass with DATA/INDEX DIRECORY(3rd version for 5.1) | gluh@mysql.com/eagle.(none) | 2008-02-28 | 1 | -37/+28 |
* | | | | BUG#25677 - With --skip-symbolic-links option on, DATA DIRECTORY | svoj@mysql.com/june.mysql.com | 2007-12-07 | 1 | -0/+8 |
|/ / / | |||||
* | | | Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines | svoj@june.mysql.com | 2007-11-12 | 1 | -3/+3 |
|\ \ \ | |/ / | |||||
| * | | Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines | svoj@june.mysql.com | 2007-11-12 | 1 | -3/+3 |
| |\ \ | | |/ | |||||
| | * | symlink.test, symlink.result: | svoj@mysql.com/june.mysql.com | 2007-11-12 | 1 | -3/+3 |
* | | | Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines | svoj@june.mysql.com | 2007-11-12 | 1 | -0/+6 |
|\ \ \ | |/ / | |||||
| * | | Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines | svoj@june.mysql.com | 2007-11-12 | 1 | -0/+6 |
| |\ \ | | |/ | |||||
| | * | After merge fix. | svoj@mysql.com/june.mysql.com | 2007-11-12 | 1 | -1/+1 |
| | * | Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.0 | svoj@mysql.com/june.mysql.com | 2007-11-12 | 1 | -0/+6 |
| | |\ | |||||
| | | * | BUG#32111 - Security Breach via DATA/INDEX DIRECORY and RENAME TABLE | svoj@mysql.com/june.mysql.com | 2007-11-06 | 1 | -0/+6 |
| | * | | Valgrind error fixes | gluh@mysql.com/eagle.(none) | 2007-02-01 | 1 | -0/+15 |
* | | | | symlink.test, symlink.result: | gshchepa/uchum@gleb.loc | 2007-07-14 | 1 | -1/+1 |
* | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-opt | gshchepa/uchum@gleb.loc | 2007-07-13 | 1 | -0/+22 |
|\ \ \ \ | |/ / / | |||||
| * | | | disabled the output of the full path in tesing bug 29325 | gkodinov/kgeorge@magare.gmz | 2007-07-13 | 1 | -2/+0 |
| * | | | Bug 29325: moved the test from create_not_windows to symlink. | gkodinov/kgeorge@magare.gmz | 2007-07-13 | 1 | -0/+24 |
* | | | | Merge fix of updated test result | msvensson@maint1.mysql.com | 2006-12-18 | 1 | -2/+2 |
* | | | | Merge maint1.mysql.com:/data/localhome/msvensson/mysql-5.0-maint | msvensson@maint1.mysql.com | 2006-12-18 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Use MYSQLTEST_VARDIR variable | msvensson@maint1.mysql.com | 2006-12-18 | 1 | -2/+2 |
* | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/50 | tsmith/tim@siva.hindu.god | 2006-12-14 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Post-merge fix to symlink.result | tsmith/tim@siva.hindu.god | 2006-12-14 | 1 | -0/+1 |
* | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/50 | tsmith/tim@siva.hindu.god | 2006-12-14 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge siva.hindu.god:/usr/home/tim/m/bk/41 | tsmith/tim@siva.hindu.god | 2006-12-14 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | myisam.result: a test was moved from the .test file, but the results were not... | tsmith/tim@siva.hindu.god | 2006-12-14 | 1 | -0/+1 |
* | | | | Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498 | thek@kpdesk.mysql.com | 2006-12-14 | 1 | -0/+21 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my41-bug17498 | thek@kpdesk.mysql.com | 2006-12-14 | 1 | -0/+21 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#17498 failed to put data file in custom directory use "data directory" op... | thek@kpdesk.mysql.com | 2006-12-14 | 1 | -0/+21 |
| * | | | Merge | evgen@moonbone.local | 2006-06-30 | 1 | -0/+6 |
| |\ \ \ | | |/ / | |||||
* | | | | Merge chilla.local:/home/mydev/mysql-5.0-ateam | ingo@chilla.local | 2006-07-06 | 1 | -0/+6 |
|\ \ \ \ |