summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* my-medium.cnf.sh:paul@kite-hub.kitebird.com2004-04-282-2/+3
* Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-04-288-10/+132
|\
| * A new option --replicate-same-server-id to force a slave to execute queries o...guilhem@mysql.com2004-04-288-10/+132
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mysql.com2004-04-2815-154/+256
|\ \
| * | Fixed http address in some scripts (Bug #3460)monty@mysql.com2004-04-289-149/+214
| * | Fixed stack overrun with some INSERT ... SELECT ... GROUP BY queries (Bug #3265)monty@mysql.com2004-04-286-5/+42
| |/
* | Merge ltantony.dsl-verizon.net:/usr/home/antony/work/mysql-4.0antony@ltantony.dsl-verizon.net2004-04-2810-11/+40
|\ \
| * | Fix for Bug 3481antony@ltantony.dsl-verizon.net2004-04-2810-11/+40
* | | Merge marko@build.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2004-04-284-5/+5
|\ \ \
| * | | InnoDB: make UNIV_SYNC_DEBUG useable againmarko@hundin.mysql.fi2004-04-284-5/+5
| | |/ | |/|
* | | memory overflow in replace.c fixedserg@serg.mylan2004-04-281-1/+2
* | | bug#3529 - my_getopt doesn't process short OPT_ARG options correctlyserg@serg.mylan2004-04-281-11/+20
* | | bug#3556 - soundexserg@serg.mylan2004-04-284-7/+7
* | | don't mention max row size, it's storage-engine dependentserg@serg.mylan2004-04-271-1/+1
|/ /
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.0serg@sergbook.mylan2004-04-241-0/+3
|\ \
| * | backport libtool fix from 4.1serg@sergbook.mylan2004-04-241-0/+3
* | | Fixed compiler error in slave.cc on some platforms.greg@mysql.com2004-04-212-66/+1
| |/ |/|
* | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-04-134-2/+61
|\ \ | |/ |/|
| * Fix for BUG#3461 "multi-table DELETE replicated despite replicate-wild-ignore...guilhem@mysql.com2004-04-134-2/+61
* | Fix typos that resulted in adding names to the global namespace thattim@sand.box2004-04-123-2/+3
* | ha_innodb.cc, sync0sync.h, sync0sync.c:heikki@hundin.mysql.fi2004-04-093-3/+46
* | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0ram@gw.mysql.r18.ru2004-04-093-0/+14
|\ \
| * | A fix. (Bug #3376: AVG(constant) returns constant if no rows in result set)ram@gw.mysql.r18.ru2004-04-093-0/+14
* | | - Merged in changes from mysqld_multi 2.6jani@rhols221.adsl.netsonic.fi2004-04-091-12/+76
| |/ |/|
* | Fix for BUG#3422 "In 3.23 -> 4.0 replication, slave segfault when replicating...guilhem@mysql.com2004-04-081-2/+14
|/
* Merge marko@build.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2004-04-081-3/+4
|\
| * InnoDB: Fix a preprocessor error introduced in ChangeSet 1.1772marko@hundin.mysql.fi2004-04-081-3/+4
* | sql_select.cc:heikki@hundin.mysql.fi2004-04-081-1/+2
* | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-04-071-6/+13
|\ \ | |/ |/|
| * Fix for BUG#3415 "mysqlbinlog loses a USE command when LOAD DATA INFILE is in...guilhem@mysql.com2004-04-071-6/+13
* | InnoDB: Remove debug functions unless #ifdef UNIV_DEBUGmarko@hundin.mysql.fi2004-04-0738-24/+144
|/
* Fix for BUG#3401 "Rare replication bug which leads to "Binlog has bad magic n...guilhem@mysql.com2004-04-071-0/+11
* Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-04-073-34/+75
|\
| * This is a fix for a bug in 3.23 -> 4.0 replication: Exec_master_log_pos is al...guilhem@mysql.com2004-04-073-34/+75
* | InnoDB: send diagnostic output to stderr or filesmarko@hundin.mysql.fi2004-04-0673-2578/+2243
* | Merge marko@build.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2004-04-063-0/+11
|\ \
| * \ Merge hundin.mysql.fi:/home/marko/j/mysql-4.0marko@hundin.mysql.fi2004-04-053-0/+11
| |\ \
| | * | InnoDB: Backport fil_path_to_mysql_datadir from MySQL 4.1.xmarko@hundin.mysql.fi2004-04-053-0/+11
* | | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0vva@eagle.mysql.r18.ru2004-04-063-6/+48
|\ \ \ \
| * | | | fixed Bug #3361 "mysqldump quotes DECIMAL values"vva@eagle.mysql.r18.ru2004-04-053-6/+48
| | |/ / | |/| |
* | | | - added ncurses-devel to the build prerequisites (BUG#3377)lenz@mysql.com2004-04-051-0/+5
| |/ / |/| |
* | | Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2004-04-052-6/+27
|\ \ \ | |/ / |/| |
| * | made fulltext search aware of concurrent insertsserg@serg.mylan2004-04-052-6/+27
* | | InnoDB: ignore intra-database foreign key references between tablesmarko@hundin.mysql.fi2004-04-027-19/+36
* | | Merge marko@build.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2004-04-025-503/+563
|\ \ \ | |/ / |/| |
| * | InnoDB: Handle quotes properly in the InnoDB SQL parsermarko@hundin.mysql.fi2004-04-025-503/+563
* | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0vva@eagle.mysql.r18.ru2004-04-013-1/+14
|\ \ \ | |/ / |/| |
| * | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0vva@eagle.mysql.r18.ru2004-04-013-1/+14
| |\ \
| | * | fixed bug #3200 "cannot compile with pstack"vva@eagle.mysql.r18.ru2004-03-193-1/+14
* | | | Merge marko@build.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2004-04-014-25/+49
|\ \ \ \