summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* After merge fixes of merge with 4.1 that included the new arena code.monty@mysql.com2004-09-0967-480/+685
* Merge with 4.1monty@mysql.com2004-09-06739-18168/+39155
|\
| * After merge fixesmonty@mysql.com2004-09-053-7/+6
| * Merge with 4.0 to get latest bug fixesmonty@mysql.com2004-09-0432-271/+431
| |\
| | * sql_yacc.yy:paul@kite-hub.kitebird.com2004-09-031-1/+1
| | * A fix (Bug #4980: union statement with () union () order by produces wrong ex...ram@gw.mysql.r18.ru2004-09-033-1/+21
| | * errmsg.txt:paul@kite-hub.kitebird.com2004-09-0222-44/+350
| | * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0ram@gw.mysql.r18.ru2004-09-023-0/+36
| | |\
| | | * A fix (Bug #5232: CREATE TABLE ... SELECT can deadlock itself).ram@gw.mysql.r18.ru2004-08-273-0/+36
| | * | Fix for bug #5302miguel@hegel.txg.br2004-09-021-1/+1
| | * | Fix for bug #5302miguel@hegel.txg.br2004-09-011-0/+7
| | * | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0lenz@mysql.com2004-09-011-221/+0
| | |\ \
| | | * \ Merge mysql.com:/space/my/mysql-4.0lenz@mysql.com2004-09-011-221/+0
| | | |\ \
| | | | * | - removed swedish errmsg.OLDlenz@mysql.com2004-09-011-221/+0
| | * | | | ha_innodb.cc:heikki@hundin.mysql.fi2004-09-011-2/+3
| | |/ / /
| | * | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0joerg@mysql.com2004-09-011-2/+2
| | |\ \ \
| | | * | | Correct a typo error: cpp symbol is "BIG_TABLES", not "BIG_FILES"joerg@mysql.com2004-09-011-2/+2
| | | |/ /
| | * | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.0patg@krsna.patg.net2004-08-311-2/+15
| | |\ \ \
| | | * | | mysqld_safe.sh:patg@krsna.patg.net2004-08-311-2/+15
| * | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1gluh@gluh.mysql.r18.ru2004-09-041-2/+3
| |\ \ \ \ \
| | * | | | | Fix for bug #4373: \u behaves differentlygluh@gluh.mysql.r18.ru2004-09-031-2/+3
| * | | | | | mergedserg@serg.mylan2004-09-034-29/+55
| |\ \ \ \ \ \
| | * | | | | | BUG#5327 - mi_sort_index() of 2-level treeserg@serg.mylan2004-09-033-9/+40
| | * | | | | | add engine=MyISAM to all create table statements inserg@serg.mylan2004-09-031-15/+15
| * | | | | | | A fix for bug#4368 '"like" fails in PreparedStatement, crashes konstantin@mysql.com2004-09-033-2/+41
| * | | | | | | define macro "DEFINE_ALL_CHARACTER_SETS" in the configure.in completelyvva@eagle.mysql.r18.ru2004-09-041-2/+2
| * | | | | | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1vva@eagle.mysql.r18.ru2004-09-0311-223/+97
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | 1. discarded term.h from the distributionvva@eagle.mysql.r18.ru2004-09-0311-223/+97
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-09-0366-448/+535
| |\ \ \ \ \ \ \
| | * | | | | | | Remove extra '/' after mysql_real_data_homemonty@mysql.com2004-09-039-11/+16
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-09-0260-437/+519
| | |\ \ \ \ \ \ \
| | | * | | | | | | After merge fixesmonty@mysql.com2004-09-027-15/+10
| | | * | | | | | | Merge with 4.0monty@mysql.com2004-09-0134-163/+246
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | | * | | | | | Do-compile:mwagner@here.mwagner.org2004-08-311-1/+1
| | | | * | | | | | Added global my_getopt_error_reporter function pointer which is ram@gw.mysql.r18.ru2004-08-3127-76/+87
| | | | | |_|_|/ / | | | | |/| | | |
| | | | * | | | | If the system has 64 bit "long", then "long long" does not add newjoerg@mysql.com2004-08-306-7/+48
| | | | * | | | | Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2004-08-3017-159/+246
| | | | |\ \ \ \ \
| | | | | * | | | | - removed mysql-test/t/flush_block_commit-master.opt as it collidedlenz@mysql.com2004-08-301-1/+0
| | | | | * | | | | log.cc:rburnett@build.mysql.com2004-08-301-1/+1
| | | | | * | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-08-292-7/+17
| | | | | |\ \ \ \ \
| | | | | | * | | | | Fix for BUG#4500 "set character set replicates incorrectly"guilhem@mysql.com2004-08-292-7/+17
| | | | | * | | | | | - fixed typo so make dist does not faillenz@mysql.com2004-08-281-1/+1
| | | | | * | | | | | Code style fixes.monty@mysql.com2004-08-287-147/+187
| | | | | |/ / / / /
| | | | | * | | | | Compile all charset conversion tables if --with-extra-charsets=allbar@mysql.com2004-08-273-0/+8
| | | | | * | | | | table.cc:bar@mysql.com2004-08-271-1/+20
| | | | | * | | | | win1251.conf:bar@mysql.com2004-08-272-2/+3
| | | | | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0rburnett@build.mysql.com2004-08-271-0/+8
| | | | | |\ \ \ \ \ | | | | | | |_|_|_|/ | | | | | |/| | | |
| | | | | | * | | | Adding a file that was missed during the first pushrburnett@build.mysql.com2004-08-271-0/+8
| | | | | * | | | | - fixed brain fart in Bootrap - it never actually caught failureslenz@mysql.com2004-08-261-4/+6
| | | | * | | | | | typo fixedserg@serg.mylan2004-08-301-1/+1
View Lorry Controller Status