Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Auto-merge from mysql-trunk-mtr. | Alexander Nozdrin | 2010-02-20 | 1 | -5/+1 |
|\ | |||||
| * | Auto-merge from mysql-5.1-mtr. | Alexander Nozdrin | 2010-02-20 | 1 | -5/+1 |
| |\ | |||||
| | * | configure.in | unknown | 2010-02-17 | 1 | -5/+1 |
| * | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-01-24 | 1 | -0/+3 |
| |\ \ | | |/ | |||||
| | * | WL#5154 Remove deprecated 4.1 features | Magne Mahre | 2010-01-21 | 1 | -0/+3 |
| * | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-22 | 1 | -0/+30 |
| |\ \ | |||||
* | | | | WL#2360 Performance schema | Marc Alff | 2010-01-11 | 1 | -0/+359 |
* | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-22 | 1 | -0/+30 |
|\ \ \ \ | |||||
| * \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 1 | -0/+30 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-12-16 | 1 | -15/+0 |
| | |\ \ \ | |||||
| | * \ \ \ | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-11 | 1 | -0/+30 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | This is a patch for bug#41569. | unknown | 2009-12-03 | 1 | -0/+30 |
* | | | | | | Automerge the changes of version 5.5.0-m2. | Joerg Bruehe | 2009-12-16 | 1 | -0/+19 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | |||||
| * | | | | Automerge the build fixes of 5.5.0-m2 back into the tree. | Joerg Bruehe | 2009-12-16 | 1 | -0/+19 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Handle the "semisync" plugin in | MySQL Build Team | 2009-11-26 | 1 | -0/+19 |
* | | | | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-12-16 | 1 | -15/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Remove .cvsignore files (attempt #2). | Alexander Nozdrin | 2009-12-16 | 1 | -15/+0 |
| | |/ / | |/| | | |||||
* | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 3 | -85/+144 |
|\ \ \ \ | |/ / / | |||||
| * | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 6 | -9/+29 |
| |\ \ \ | | |/ / | |||||
| * | | | Manual merge from the mysql-5.1-bugteam. | Alexey Kopytov | 2009-11-24 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge | Kent Boortz | 2009-11-17 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Include the "mysql-test/collections" directory when creating windows ZIP archive | Kent Boortz | 2009-11-17 | 1 | -1/+1 |
| * | | | | Manual merge from the mysql-5.1-bugteam. | Alexey Kopytov | 2009-11-24 | 2 | -84/+143 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | auto-merge | Timothy Smith | 2009-11-04 | 2 | -84/+143 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Add a few comments to clarify do_query() return values in mysql_secure_instal... | Timothy Smith | 2009-11-03 | 1 | -0/+4 |
| | | * | | Bug#48031: mysql_secure_installation -- bash bug regarding passwords with | Timothy Smith | 2009-11-03 | 2 | -6/+48 |
| | | * | | Bug#48086: mysql_secure_installation does NOT work on Solaris | Timothy Smith | 2009-11-03 | 1 | -3/+1 |
| | | * | | Bug#35106: mysql_secure_installation fails on Windows, missing "use | Timothy Smith | 2009-10-30 | 1 | -77/+92 |
* | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-03 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-02 | 2 | -4/+4 |
| |\ \ \ \ \ | |||||
| * | | | | | | Backport of WL#798 (MySQL IPv6 support) from 6.0. | Alexander Nozdrin | 2009-11-25 | 1 | -0/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-02 | 2 | -4/+4 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 2 | -4/+4 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Andrei Elkin | 2009-11-30 | 2 | -1/+5 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest) | Luis Soares | 2009-11-13 | 2 | -4/+4 |
| | |\ \ \ \ | |||||
| | | * | | | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-04 | 2 | -4/+4 |
* | | | | | | | bug#36462: mysql_install_db fails when run as user root and | Jonathan Perkin | 2009-11-23 | 1 | -1/+7 |
* | | | | | | | Backport of the fix for BUG#40368 "mysqld_safe not honouring underscore same ... | Guilhem Bichot | 2009-11-18 | 1 | -1/+7 |
|/ / / / / / | |||||
* | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 2 | -1/+5 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 2 | -1/+5 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2009-10-27 | 2 | -1/+5 |
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/| | |||||
| | | * | | Bug#41049 does syntax "grant" case insensitive? | Sergey Glukhov | 2009-10-27 | 2 | -1/+5 |
| | | * | | backport of Chad's fix for bug #39326 to 5.0-bugteam | Georgi Kodinov | 2009-08-19 | 1 | -5/+19 |
| | | * | | Merge the bug fix for 37808 ("make_binary_distribution.sh") | Joerg Bruehe | 2009-07-21 | 1 | -5/+45 |
| | | |\ \ | |||||
* | | | \ \ | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-02 | 2 | -1/+6 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Automerge from mysql-next-mr. | Alexander Nozdrin | 2009-10-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Automerge from mysql-next-mr. | Alexander Nozdrin | 2009-10-22 | 5 | -2/+155 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | bug#33731 - INSTALL/UNINSTALL PLUGIN: Inconsistent handling of identifier case | Sergei Golubchik | 2009-10-12 | 2 | -1/+6 |
* | | | | | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Postfix for WL#1349. | Alexander Barkov | 2009-10-23 | 1 | -1/+1 |
| | |/ / / / / / | |/| | | | | | |