summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.(none)2004-08-242-3/+5
|\
| * more aliases in ndb configtomas@poseidon.(none)2004-08-242-3/+5
* | compatibility fixesserg@serg.mylan2004-08-243-4/+1
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-08-246-51/+102
|\ \ | |/
| * Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.(none)2004-08-246-51/+102
| |\
| | * bug fixtomas@poseidon.(none)2004-08-241-5/+5
| | * enables case insensitivity in ndb config filetomas@poseidon.(none)2004-08-244-43/+47
| | * Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.(none)2004-08-244-7/+54
| | |\
| | | * added alias MYSQLD for APItomas@poseidon.(none)2004-08-244-7/+54
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-08-2419-63/+327
|\ \ \ \ | |/ / / |/| | |
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-08-2443-1092/+2943
| |\ \ \
| * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-08-2419-62/+325
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | automergedserg@serg.mylan2004-08-241-21/+34
| | |\ \ \
| | | * | | Fix for bug #4340: find_in_set is case insensitive even on binary operators(f...gluh@gluh.mysql.r18.ru2004-08-243-21/+51
| | * | | | followupserg@serg.mylan2004-08-242-8/+5
| | * | | | manually mergedserg@serg.mylan2004-08-2412-26/+102
| | |\ \ \ \
| | | * | | | Fix warning VC++ and fix applied fisrt to source 4.1miguel@hegel.txg.br2004-08-243-22/+10
| | | * | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0gluh@gluh.mysql.r18.ru2004-08-243-5/+36
| | | |\ \ \ \
| | | | * | | | Fix for bug #4340: find_in_set is case insensitive even on binary operators(2...gluh@gluh.mysql.r18.ru2004-08-243-5/+36
| | | * | | | | - make sure to recreate all autoconf/automake-related files afterlenz@mysql.com2004-08-242-1/+4
| | | |/ / / /
| | | * | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-08-234-6/+40
| | | |\ \ \ \
| | | | * | | | Fix for BUG#5033 "When using temporary tables truncate does NOT reset the aut...guilhem@mysql.com2004-08-234-6/+40
| | | * | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0gluh@gluh.mysql.r18.ru2004-08-233-2/+39
| | | |\ \ \ \ \
| | | | * | | | | Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returnsgluh@gluh.mysql.r18.ru2004-08-233-2/+39
| | | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0pem@mysql.com2004-08-233-2/+28
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | | * | | | | Fixed: BUG#5135: cannot turn on log_warnings with SET in 4.1 (and 4.0)pem@mysql.com2004-08-233-2/+28
| | | | |/ / / /
| | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-08-245-13/+189
| | |\ \ \ \ \ \
| | | * | | | | | BDB: Bug#4531: unique key prefix interacts poorly with utf8,serg@serg.mylan2004-08-245-13/+189
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@mysql.com2004-08-251-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | committed skipped filevva@eagle.mysql.r18.ru2004-08-251-0/+3
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@mysql.com2004-08-2543-1092/+2942
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1vva@eagle.mysql.r18.ru2004-08-2543-1092/+2942
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | resurrect fix for vva@eagle.mysql.r18.ru2004-08-251-1/+1
| | * | | | | | | fixed AC_DEFINE's for libedit-2.6.7vva@eagle.mysql.r18.ru2004-08-242-3/+4
| | * | | | | | | added skipped file for libedit-2.6.7vva@eagle.mysql.r18.ru2004-08-248-0/+1181
| | * | | | | | | added skipped macro for new libedit-2.6.7 in configure.invva@eagle.mysql.r18.ru2004-08-241-0/+16
| | * | | | | | | upgrade to libedit-2.6.7vva@eagle.mysql.r18.ru2004-08-2435-1092/+1745
* | | | | | | | | Merge: manual resolvekonstantin@mysql.com2004-08-2410-72/+158
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix for Bug#5034 "prepared "select 1 into @arg15", second konstantin@mysql.com2004-08-2410-75/+161
* | | | | | | | | fixed AC_DEFINE(HAVE_HIST_ENTRY) in acinclude.m4vva@eagle.mysql.r18.ru2004-08-251-1/+2
* | | | | | | | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1vva@eagle.mysql.r18.ru2004-08-244-1/+61
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | fixed :vva@eagle.mysql.r18.ru2004-08-244-1/+61
| |/ / / / / / /
* | | | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1rburnett@build.mysql.com2004-08-241-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | my_handler.c:rburnett@build.mysql.com2004-08-241-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-08-246-17/+31
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Portablity fixes & simple optimizationsmonty@mysql.com2004-08-246-17/+31
* | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2004-08-2410-21/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Use "configured" socklen_tjoreland@mysql.com2004-08-244-4/+12
| * | | | | | | | Compile fix sol9x86joreland@mysql.com2004-08-247-17/+11
* | | | | | | | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1vva@eagle.mysql.r18.ru2004-08-2410-13/+28
|\ \ \ \ \ \ \ \ \