summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-221-0/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-0/+30
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Automerge the changes of version 5.5.0-m2.Joerg Bruehe2009-12-161-0/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-15/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-123-85/+144
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | 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 of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-03-121-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Bug #35250: readline check breaks when doing vpath buildGeorgi Kodinov2010-03-091-3/+2
* | | | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-03-071-2/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | mergeGeorgi Kodinov2010-03-011-2/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Bug#49823: mysql_upgrade fatal error due to general_log / slow_low CSV NULLDavi Arnaut2010-02-261-2/+19
* | | | | | | | | | | | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2010-03-011-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Bug #51468: mysqld_multi is broken in 5.1.44Georgi Kodinov2010-02-261-1/+0
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-02-261-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Bug #35250: readline check breaks when doing vpath buildGeorgi Kodinov2010-02-121-2/+3
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-02-231-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
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | 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 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
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-161-15/+0
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-116-9/+29
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-062-1/+5
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | 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
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-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
| |/ / / / / / / / /