summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2005-09-071-0/+1
|\
| * Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1bell@sanja.is.com.ua2005-09-061-0/+1
| |\
| | * postmerge fixbell@sanja.is.com.ua2005-09-061-0/+1
* | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2005-09-061-0/+7
|\ \ \ | |/ /
| * | mysqld.cc:bar@mysql.com2005-09-061-1/+0
| * | Merge mysql.com:/usr/home/bar/mysql-4.1.b9948bar@mysql.com2005-09-061-0/+8
| |\ \ | | |/
| | * Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-09-051-2/+2
| | |\
| | * | mysqld.cc, mysql_priv.h, sql_parse.cc:bar@mysql.com2005-09-051-6/+6
| | * | bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC ...bar@mysql.com2005-08-311-0/+7
* | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2005-09-021-2/+2
|\ \ \ \ | |/ / /
| * | | Merge mysql.com:/home/dlenev/src/mysql-4.1-bg12423dlenev@mysql.com2005-09-011-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@mysql.com2005-09-011-2/+2
| | |\ \ | | | |/ | | |/|
| | | * Fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in dlenev@mysql.com2005-09-011-2/+2
| | * | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1paul@frost.snake.net2005-08-271-4/+4
| | |\ \
| | * \ \ Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0jani@a193-229-222-105.elisa-laajakaista.fi2005-08-251-0/+1
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Several fixes for Netware.jani@a193-229-222-105.elisa-laajakaista.fi2005-08-241-3/+13
| | | * | Some minor fixes for Netware. These were required after we started buildingjani@a193-229-222-105.elisa-laajakaista.fi2005-08-181-0/+1
| | * | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1patg@radha.local2005-08-191-1/+1
| | |\ \ \
| | | * | | BUG #12498 Fixed mispellingpatg@radha.local2005-08-191-1/+1
| | * | | | Changes for Netware. This is needed when building against newer Libcjani@a193-229-222-105.elisa-laajakaista.fi2005-08-181-0/+1
* | | | | | mergendbdev@dl145b.mysql.com2005-08-311-18/+21
|\ \ \ \ \ \ | |/ / / / /
| * | | | | mysqld.cc:paul@kite-hub.kitebird.com2005-08-301-6/+6
| * | | | | Manual merge.paul@kite-hub.kitebird.com2005-08-301-579/+947
| | |_|_|/ | |/| | |
| * | | | mysqld.cc:paul@frost.snake.net2005-08-271-4/+4
| |/ / /
* | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se2005-08-251-5/+22
|\ \ \ \
| * | | | Fixes during review of new pushed codemonty@mishka.local2005-08-201-1/+2
| * | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-08-151-1/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge mysql.com:/home/jimw/my/mysql-4.1-11796jimw@mysql.com2005-08-151-1/+5
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Avoid problems on shutdown by shutting down replication slave threadsjimw@mysql.com2005-08-081-1/+5
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-08-151-0/+6
| |\ \ \ \
| | * \ \ \ mergedserg@sergbook.mysql.com2005-08-121-0/+6
| | |\ \ \ \
| | | * | | | BUG#12162 - one can start two transactions with the same XID.serg@sergbook.mysql.com2005-08-121-0/+6
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-08-121-4/+6
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fixes during review of new pushed codemonty@mysql.com2005-08-121-2/+2
| | * | | | | Cleanups during review of new codemonty@mysql.com2005-08-111-2/+4
| | |/ / / /
| * | | | | set_var.cc, mysqld.cc, ha_innodb.h, ha_innodb.cc, srv0srv.c, srv0srv.h:vtkachenko@quadxeon.mysql.com2005-08-111-0/+4
| |/ / / /
* | | | | posr review fixes of prev patchtomas@poseidon.ndb.mysql.com2005-08-221-1/+1
* | | | | generalized option for specifying ndb distributiontomas@poseidon.ndb.mysql.com2005-08-221-11/+25
* | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se2005-08-051-50/+107
|\ \ \ \ \ | |/ / / /
| * | | | Merginghf@deer.(none)2005-08-041-1/+2
| |\ \ \ \ | | |/ / /
| | * | | Fix for bug #12177 (errorlog file isn't closed)hf@deer.(none)2005-08-041-1/+2
| * | | | Merge mysql.com:/home/jimw/my/mysql-5.0-7003jimw@mysql.com2005-08-021-1/+20
| |\ \ \ \
| | * | | | Add my_str_malloc and _free function pointers to strings libraryjimw@mysql.com2005-06-241-1/+20
| * | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2005-07-291-4/+41
| |\ \ \ \ \
| | * | | | | store/restore sql_mode which was in force during ctrigger creation (BUG#5891)bell@sanja.is.com.ua2005-07-281-4/+41
| * | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-10351jimw@mysql.com2005-07-291-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fix for handling of unsigned long options on 32-bit platforms thatjimw@mysql.com2005-07-281-1/+1
| * | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-10351jimw@mysql.com2005-07-281-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fix value returned from SELECT of unsigned long systemjimw@mysql.com2005-07-221-1/+1
| | |/ / / / /
| * | | | | | Merge deer.(none):/home/hf/work/mysql-4.1.11329hf@deer.(none)2005-07-271-44/+44
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | |