summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Import patch for yassl 1.35msvensson@shellback.(none)2006-06-054-9/+47
* Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0anna@hasky.mysql.fi2006-06-027-4/+43
|\
| * Fixed Bug#19479:mysqldump creates invalid dump.anjuta@arthur.local2006-06-017-4/+43
* | Post-merge fixesigor@rurik.mysql.com2006-06-012-4/+4
* | Merge rurik.mysql.com:/home/igor/mysql-5.0igor@rurik.mysql.com2006-06-0113-22/+51
|\ \
| * | Post-merge fixesigor@rurik.mysql.com2006-05-318-11/+22
| * | Manual mergeigor@rurik.mysql.com2006-05-311-209/+931
| * | Merge rurik.mysql.com:/home/igor/tmp_mergeigor@rurik.mysql.com2006-05-319-942/+238
| |\ \
| | * \ Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1igor@rurik.mysql.com2006-05-3033-41/+16
| | |\ \
| | | * | Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEXigor@rurik.mysql.com2006-05-3033-41/+16
| | * | | make_win_src_distribution.sh:kent@mysql.com2006-05-291-0/+1
| | * | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2006-05-2934-61/+88
| | |\ \ \ | | | |/ /
| | | * | Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2006-05-281-2/+2
| | | |\ \
| | | * | | Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEXigor@rurik.mysql.com2006-05-2733-59/+86
| | * | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2006-05-2714-1066/+1999
| | |\ \ \ \ | | | |/ / /
| | * | | | make_sharedlib_distribution.sh:kent@mysql.com2006-05-231-2/+4
* | | | | | Merge zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.(none)2006-06-015-61/+431
|\ \ \ \ \ \
| * \ \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/mysql-5.0msvensson@shellback.(none)2006-06-015-61/+431
| |\ \ \ \ \ \
| | * | | | | | Bug#18235: assertion/crash when windows mysqld is ended with ctrl-ctnurnberg@mysql.com2006-05-311-1/+5
| | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintiggy@mysql.com2006-05-301-2/+6
| | |\ \ \ \ \ \
| | | * | | | | | BUG#18669: Session COM_STATISTICS breaks mysqladmin status.iggy@mysql.com2006-05-241-2/+6
| | * | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-05-294-58/+420
| | |\ \ \ \ \ \ \
| | | * | | | | | | Update after merge to 5.0msvensson@neptunus.(none)2006-05-293-20/+25
| | | * | | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug16297/my50-bug16297msvensson@neptunus.(none)2006-05-293-56/+412
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Bug#16297 In memory grant tables not flushed when users's hostname is ""msvensson@neptunus.(none)2006-05-233-56/+412
| | | * | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2006-05-291-1/+2
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintelliot@mysql.com2006-05-241-1/+2
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | BUG#19394 OPT_INNODB_THREAD_CONCURRENCY duplicatedelliot@mysql.com2006-04-281-1/+2
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@shellback.(none)2006-06-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Add define YASSL_PREFIX when compiling yasslmsvensson@shellback.(none)2006-06-011-2/+2
* | | | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0jonas@perch.ndb.mysql.com2006-06-015-3/+92
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0jonas@perch.ndb.mysql.com2006-06-015-3/+92
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2006-06-015-3/+92
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/41-workjonas@perch.ndb.mysql.com2006-06-015-3/+92
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | ndb - bug#20185jonas@perch.ndb.mysql.com2006-06-015-3/+92
* | | | | | | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold@mysql.com2006-06-017-30/+143
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold@mysql.com2006-05-317-30/+143
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Bug #16997 Table rename that changes database does not rename indexes: mergemskold@mysql.com2006-05-243-16/+18
| | * | | | | | | | | | | | | | | Merge mysql.com:/home/marty/MySQL/mysql-4.1mskold@mysql.com2006-05-227-30/+141
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/marty/MySQL/mysql-4.1_oldmskold@mysql.com2006-05-127-32/+143
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Bug#16997 Table rename that changes database does not rename indexes, recrea...mskold@mysql.com2006-05-057-32/+143
* | | | | | | | | | | | | | | | | | | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@devsrv-b.mysql.com2006-06-012-12/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Bug#14157: utf8 encoding in binlog without set character_set_clientaelkin@dl145k.mysql.com2006-05-311-1/+1
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | BUG#14157: utf8 encoding in binlog without set character_set_clientaelkin@dl145k.mysql.com2006-05-312-2/+6
| * | | | | | | | | | | | | | | | Merge dl145k.mysql.com:/tmp/andrei/MERGE/mysql-4.1aelkin@dl145k.mysql.com2006-05-311-10/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | BUG#14157: utf8 encoding in binlog without set character_set_clientaelkin@mysql.com2006-05-281-2/+2
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | updated libtool/autoconf filesacurtis@xiphis.org2006-05-253-1056/+1935
| | * | | | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil@mysql.com2006-05-251-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil@mysql.com2006-03-031-2/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil@mysql.com2006-02-081-2/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \