summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-133-11/+2
|\
| * memcpy_overlap() replaced with memmove() during the merging.unknown2005-10-131-1/+1
| * Merge mysql.com:/usr/home/ram/work/mysql-4.0unknown2005-10-132-10/+1
| |\
| | * memcpy_overlap() removed, as unknown2005-10-122-11/+1
| | * Merge mysql.com:/space/my/mysql-4.0unknown2005-10-111-1/+1
| | |\
| | * \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-10-096-1/+38
| | |\ \
* | | \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-133-10/+45
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bug#12476 Some big5 codes are still missing.unknown2005-10-053-10/+45
| * | | | item_cmpfunc.cc:unknown2005-10-051-1/+1
* | | | | Merge bk-internal:/home/bk/mysql-4.1unknown2005-10-126-0/+44
|\ \ \ \ \
| * \ \ \ \ Manual mergedunknown2005-10-136-0/+44
| |\ \ \ \ \
| | * | | | | select.test, sql_select.cc, sql_lex.cc, item.cc:unknown2005-10-134-5/+17
| | * | | | | Manual merge, fix for bug #7672unknown2005-10-125-0/+31
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Fix bug#7672 Unknown column error in order clauseunknown2005-10-096-1/+38
* | | | | | | Merge bk-internal:/home/bk/mysql-4.1unknown2005-10-121-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | To force a restart at the end of test, the option file must be non-empty, it'...unknown2005-10-121-0/+1
* | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-6413unknown2005-10-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix read past allocated buffer when parsing charsets file. (Bug #6413)unknown2005-10-111-1/+1
* | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-12136unknown2005-10-121-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Tweak kill test to avoid spurious test failure on SCO OpenServer. (Bug #12136)unknown2005-09-201-0/+1
* | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-8731bunknown2005-10-1211-99/+77
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix wait_timeout (and kill) handling on Mac OS X by cleaning up howunknown2005-10-1111-99/+77
* | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-13344unknown2005-10-123-0/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix CAST(1.0e+300 TO SIGNED). (Bug #13344)unknown2005-09-223-0/+16
* | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-13619unknown2005-10-123-1/+16
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Handle errors returned by system crypt() in ENCRYPT(). (Bug #13619)unknown2005-10-063-1/+16
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | mergeunknown2005-10-12106-540/+45165
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-123-1/+11
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | sql_yacc.yy:unknown2005-10-123-1/+11
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge mysql.com:/space/my/mysql-4.1unknown2005-10-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge mysql.com:/space/my/mysql-4.0-buildunknown2005-10-111-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | - added Docs/manual.chm to the windows source distribution (BUG#13899)unknown2005-10-111-1/+1
| | | | |_|_|_|_|_|/ | | | |/| | | | | |
| * | | | | | | | | Fix for bug#9270 multiple SSL race conditions (for 5.0 tree)unknown2005-10-111-0/+97
| * | | | | | | | | Added missing HAVE_REPLICATION defineunknown2005-10-101-1/+3
| |/ / / / / / / /
| * | | | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1unknown2005-10-106-5/+80
| |\ \ \ \ \ \ \ \
| | * | | | | | | | additional fix for bug #13372 (decimal union)unknown2005-09-271-1/+1
| | * | | | | | | | additional fix to the bug #13372 (decimal union)unknown2005-09-272-3/+3
| | * | | | | | | | Fix for bug #13372 (decimal union)unknown2005-09-275-4/+79
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | BUG#12618: Removing fake lockingunknown2005-10-104-85/+151
| * | | | | | | | Bug #13611 double [TCP DEFAULT] in config.ini crashes ndb_mgmdunknown2005-10-101-2/+6
| * | | | | | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-10-083-1/+17
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Bug #10942 "deadlock with FLUSH TABLES WITH READ LOCK + STOP SLAVE"unknown2005-10-083-1/+17
| * | | | | | | | | Merge mysqldev@production.mysql.com:my/mysql-4.1-releaseunknown2005-10-072-0/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Populate t1 in order to get more predictable explain results.unknown2005-10-072-0/+3
| | * | | | | | | | | Copy zlib.a and valgrind.supp if exists.unknown2005-10-071-1/+4
| * | | | | | | | | | make_binary_distribution.sh:unknown2005-10-071-1/+4
| * | | | | | | | | | Increase the version number.unknown2005-10-071-2/+2
| |/ / / / / / / / /
| * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-075-44/+49
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Review of new code since last pullunknown2005-10-075-44/+49
| * | | | | | | | | | make_binary_distribution.sh:unknown2005-10-072-3/+3