summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-trunk-mtr.Alexander Nozdrin2010-02-201-5/+1
|\
| * Auto-merge from mysql-5.1-mtr.Alexander Nozdrin2010-02-201-5/+1
| |\
| | * configure.inunknown2010-02-171-5/+1
| * | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-241-0/+3
| |\ \ | | |/
| | * WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-01-211-0/+3
| * | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-221-0/+30
| |\ \
* | | | WL#2360 Performance schemaMarc Alff2010-01-111-0/+359
* | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-221-0/+30
|\ \ \ \
| * \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-0/+30
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-15/+0
| | |\ \ \
| | * \ \ \ Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-111-0/+30
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | This is a patch for bug#41569.unknown2009-12-031-0/+30
* | | | | | Automerge the changes of version 5.5.0-m2.Joerg Bruehe2009-12-161-0/+19
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Automerge the build fixes of 5.5.0-m2 back into the tree.Joerg Bruehe2009-12-161-0/+19
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Handle the "semisync" plugin inMySQL Build Team2009-11-261-0/+19
* | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-15/+0
|\ \ \ \ \ | |/ / / /
| * | | | Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-161-15/+0
| | |/ / | |/| |
* | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-123-85/+144
|\ \ \ \ | |/ / /
| * | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-116-9/+29
| |\ \ \ | | |/ /
| * | | Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-241-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | MergeKent Boortz2009-11-171-1/+1
| | |\ \
| | | * | Include the "mysql-test/collections" directory when creating windows ZIP archiveKent Boortz2009-11-171-1/+1
| * | | | Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-242-84/+143
| |\ \ \ \ | | |/ / /
| | * | | auto-mergeTimothy Smith2009-11-042-84/+143
| | |\ \ \ | | | |/ /
| | | * | Add a few comments to clarify do_query() return values in mysql_secure_instal...Timothy Smith2009-11-031-0/+4
| | | * | Bug#48031: mysql_secure_installation -- bash bug regarding passwords withTimothy Smith2009-11-032-6/+48
| | | * | Bug#48086: mysql_secure_installation does NOT work on SolarisTimothy Smith2009-11-031-3/+1
| | | * | Bug#35106: mysql_secure_installation fails on Windows, missing "useTimothy Smith2009-10-301-77/+92
* | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-031-0/+1
|\ \ \ \ \
| * \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-022-4/+4
| |\ \ \ \ \
| * | | | | | Backport of WL#798 (MySQL IPv6 support) from 6.0.Alexander Nozdrin2009-11-251-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-022-4/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Manual resolving for the following filesAndrei Elkin2009-12-012-4/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-302-1/+5
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-132-4/+4
| | |\ \ \ \
| | | * | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-042-4/+4
* | | | | | | bug#36462: mysql_install_db fails when run as user root andJonathan Perkin2009-11-231-1/+7
* | | | | | | Backport of the fix for BUG#40368 "mysqld_safe not honouring underscore same ...Guilhem Bichot2009-11-181-1/+7
|/ / / / / /
* | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-062-1/+5
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-052-1/+5
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-10-272-1/+5
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/|
| | | * | Bug#41049 does syntax "grant" case insensitive?Sergey Glukhov2009-10-272-1/+5
| | | * | backport of Chad's fix for bug #39326 to 5.0-bugteamGeorgi Kodinov2009-08-191-5/+19
| | | * | Merge the bug fix for 37808 ("make_binary_distribution.sh")Joerg Bruehe2009-07-211-5/+45
| | | |\ \
* | | | \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-022-1/+6
|\ \ \ \ \ \
| * \ \ \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-281-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-225-2/+155
| |\ \ \ \ \ \ \
| * | | | | | | | bug#33731 - INSTALL/UNINSTALL PLUGIN: Inconsistent handling of identifier case Sergei Golubchik2009-10-122-1/+6
* | | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Postfix for WL#1349. Alexander Barkov2009-10-231-1/+1
| | |/ / / / / / | |/| | | | | |