summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* logging_ok:mikael@mc04.(none)2004-09-1524-538/+701
* Fix braces wrt to DBUG_xxxndbdev@ndbmaster.mysql.com2004-09-061-1/+7
* Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbtomas@poseidon.(none)2004-09-068-55/+94
|\
| * fixed so that ndbcluster and mysqld can be started independentlytomas@poseidon.(none)2004-09-068-55/+94
* | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbjoreland@mysql.com2004-09-061-2/+3
|\ \ | |/ |/|
| * testReadPerf fixesjoreland@mysql.com2004-09-061-1/+2
| * testReadPerf joreland@mysql.com2004-09-061-1/+1
* | -d default on ndb_mgmd and ndbdtomas@poseidon.(none)2004-09-065-21/+42
* | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbtomas@poseidon.(none)2004-09-06138-1345/+2055
|\ \ | |/
| * removed faked do_workjoreland@mysql.com2004-09-061-15/+0
| * mergejoreland@mysql.com2004-09-062-4/+4
| * mergejoreland@mysql.com2004-09-06134-1311/+1643
| |\
| | * memory leak fixedbell@sanja.is.com.ua2004-09-051-3/+5
| | * 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