summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* Auto-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
* | | | | Backport of WL#798 (MySQL IPv6 support) from 6.0.Alexander Nozdrin2009-11-251-0/+1
|/ / / /
* | | | 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
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-235-2/+155
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-211-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | WL#751 Error message construction, backportSergey Glukhov2009-10-151-1/+1
| | |/ / / / / /
| * | | | | | | Automerge from mysql-trunk-merge.Alexander Nozdrin2009-10-193-1/+153
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Automerge from mysql-trunk.Alexander Nozdrin2009-10-193-1/+153
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge from mysql-5.4.3-beta-releaseTimothy Smith2009-10-163-1/+153
| | | |\ \ \ \ \ \
| | | | * | | | | | make_binary_distribution.sh: fix path for installing the MALLOC_LIB (to $DEST...unknown2009-09-291-1/+1
| | | | * | | | | | make_binary_distribution and mysql.spec: add options to copy a shared library...unknown2009-09-291-0/+8
| | | | * | | | | | Add --malloc-lib=LIB option to mysqld_safe to LD_PRELOAD a shared library for...unknown2009-09-232-1/+145
| * | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | / / / / / | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-131-0/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | / / / / | | | | |/ / / / | | | |/| | | |
| | | * | | | | bug#41546: mysql-stress-run.pl is not packaged on WindowsJonathan Perkin2009-09-301-0/+1
| | | | |_|_|/ | | | |/| | |
* | | | | | | A backporting patch for WL#4300 (Define privileges for tablespaces).Alexander Nozdrin2009-10-103-4/+16
* | | | | | | Bug #34197 CREATE PROCEDURE fails when COMMENT truncated in non Jon Olav Hauglid2009-10-092-1/+4
|/ / / / / /
* | | | | | Backport of the patch Vladislav Vaintroub2009-09-301-1/+1
|/ / / / /
* | | | | Merge from mysql-5.1.Alexander Nozdrin2009-09-231-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Install mysqld.libJonathan Perkin2009-09-041-0/+1
* | | | | Merge from mysql-5.1.Alexander Nozdrin2009-09-191-0/+17
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Only install the innodb plugin if the plugin directory exists.Jonathan Perkin2009-09-011-8/+14
| * | | Install innodb_plugin on Windows.Jonathan Perkin2009-08-181-0/+11
* | | | This is the 5.4 version of the fix for bug#47007Joerg Bruehe2009-09-083-3/+2
* | | | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-121-5/+54
|\ \ \ \ | |/ / /
| * | | Merge the fix for bug#37808 into 5.1-build.Joerg Bruehe2009-07-211-5/+54
| |\ \ \
| | * \ \ Upmerge a bug fix from 5.0 to 5.1:Joerg Bruehe2009-07-211-5/+54
| | |\ \ \ | | | | |/ | | | |/|
| | | * | This is a fix for bug#37808Joerg Bruehe2009-06-261-5/+45
* | | | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-049-54/+100
|\ \ \ \ \ | |/ / / /
| * | | | automergeGeorgi Kodinov2009-06-191-1/+19
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Bug #36654: mysqld_multi cannot start instances with different versions Georgi Kodinov2009-06-191-1/+19
| | |/
| * | Merge up 5.0-build into 5.1-build:Joerg Bruehe2009-05-295-5/+5
| |\ \ | | |/
| | * Use /usr/bin/perl as standard Perl install path (bug#44643)Kent Boortz2009-05-095-5/+5
| | * Merge main 5.0 into 5.0-buildJoerg Bruehe2009-05-082-35/+30
| | |\
| * | | Bug #44736 mysqld_safe's my_which() is broken and Staale Smedseng2009-05-251-1/+1