summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@gluh.mysql.r18.ru2005-01-272-4/+14
|\
| * A fix: information_schema test fails on Mac OSXgluh@gluh.mysql.r18.ru2005-01-272-4/+14
* | Merge mysql.com:/home/mydev/mysql-4.1-4100ingo@mysql.com2005-01-273-7/+14
|\ \
| * \ Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-01-273-7/+14
| |\ \
| | * | item_timefunc.cc:bar@mysql.com2005-01-271-5/+12
| | * | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ram@gw.mysql.r18.ru2005-01-262-2/+2
| | |\ \
| | | * \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ram@gw.mysql.r18.ru2005-01-242-2/+2
| | | |\ \
| | | | * | A fix (Bug #8015: server refuses to start with long basedir path).ram@gw.mysql.r18.ru2005-01-212-2/+2
* | | | | | Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2005-01-277-158/+303
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0patg@patrick-galbraiths-computer.local2005-01-2616-45/+91
| |\ \ \ \ \
| * | | | | | changes to get rid of compile warnings in both ha_federated.cc and ha_federat...patg@patrick-galbraiths-computer.local2005-01-262-14/+15
| * | | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0patg@patrick-galbraiths-computer.local2005-01-257-144/+288
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0patg@patrick-galbraiths-computer.local2005-01-247-144/+288
| | |\ \ \ \ \ \
| | | * | | | | | -Added quote_data and needs_quotes (moved from federated handler.patg@pc248.lfp.kcls.org2005-01-206-182/+199
| | | * | | | | | progress in fixing multi-key, two-byte prefix keys.patg@patrick-galbraiths-computer.local2005-01-132-13/+140
| | | * | | | | | change to have_<> variable for federated enginepatg@patrick-galbraiths-computer.local2005-01-131-1/+1
* | | | | | | | | Test bug: Memory leak in archive handler.ingo@mysql.com2005-01-261-0/+1
* | | | | | | | | Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2005-01-264-7/+14
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-01-268-14/+12
| |\ \ \ \ \ \ \ \
| | * | | | | | | | timed_mutexes moved to include/my_sys.h and mysys/my_static.cram@gw.mysql.r18.ru2005-01-262-2/+0
| * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-01-267-26/+65
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-01-264-5/+14
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fix for bug #7637: "Test failure: 'user_limits' on QNX and 64-bit systems"dlenev@brandersnatch.localdomain2005-01-204-5/+14
* | | | | | | | | | | Merge from 4.1ingo@mysql.com2005-01-263-18/+59
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-01-262-9/+51
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| * | | | | | | | | | Test Bug: Memory leaks in the archive handler.ingo@mysql.com2005-01-263-18/+59
| * | | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-01-265-20/+14
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-01-251-1/+17
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-01-246-27/+23
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-01-201-1/+17
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | | * | | | | | | | | | BUG#6034 - Error code 124: Wrong medium type.ingo@mysql.com2005-01-191-1/+17
* | | | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2005-01-2613-38/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Fixes for windows compilation bugsgeorg@beethoven.site2005-01-266-12/+12
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0ram@gw.mysql.r18.ru2005-01-261-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | CSC#4385: slow sorting for UTF8 large table:bar@mysql.com2005-01-261-2/+2
| * | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0ram@gw.mysql.r18.ru2005-01-262-9/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Mergetomas@poseidon.ndb.mysql.com2005-01-262-9/+50
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2005-01-262-9/+51
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Bug#8101 unique indexes which attribute are _not_ specified in the order of ...tomas@poseidon.ndb.mysql.com2005-01-262-5/+50
| | | | * | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2005-01-261-4/+1
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2005-01-251-4/+1
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2005-01-251-4/+1
| | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | changed from using column names to column id in ndb setBound in ha_ndbclustertomas@poseidon.ndb.mysql.com2005-01-251-4/+1
| | | | | | | |/ / / / / / / /
| * | | | | | | | | | | | | | after review fixup (bug #8129: help.test fails using --ps-protocol)ram@gw.mysql.r18.ru2005-01-261-0/+4
| * | | | | | | | | | | | | | a fix (bug #8129: help.test fails using --ps-protocol)ram@gw.mysql.r18.ru2005-01-261-1/+2
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1serg@serg.mylan2005-01-261-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | innobase/include/univ.iserg@serg.mylan2005-01-261-2/+3
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | mergedserg@serg.mylan2005-01-252-12/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | / / / / | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Cleanups during reviewmonty@mysql.com2005-01-252-12/+4
| | |/ / / / / / / / /
| | * | | | | | | | | Fix for failing INSERT IGNORE in test ndb_insertmskold@mysql.com2005-01-251-5/+5
| | |/ / / / / / / /