summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1msvensson@neptunus.(none)2006-10-031-8/+9
|\
| * Merge rama.(none):/home/jimw/my/mysql-5.0-cleanjimw@rama.(none)2006-09-281-8/+9
| |\
| | * Merge rama.(none):/home/jimw/my/mysql-4.1-cleanjimw@rama.(none)2006-09-281-9/+10
| | |\
| | | * Bug #2717: include/my_global.h mis-defines __attribute__jimw@rama.(none)2006-08-171-10/+11
* | | | This patch updates to remove most global hton needs. Cleans up wrong message ...brian@zim.(none)2006-09-301-2/+1
* | | | This patch adds handlerton passing to functions. NDB and Innodb still require...brian@zim.(none)2006-09-301-0/+9
|/ / /
* | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2006-09-211-1/+11
|\ \ \
| * \ \ Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2006-09-151-1/+11
| |\ \ \
| | * \ \ Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2006-09-111-1/+11
| | |\ \ \
| | | * | | Changes made according to HLD/LLD.aelkin/elkin@andrepl.dsl.inet.fi2006-08-301-1/+11
* | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1baker@bk-internal.mysql.com2006-09-161-2/+49
|\ \ \ \ \ \
| * \ \ \ \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1brian@zim.(none)2006-09-151-2/+49
| |\ \ \ \ \ \
| | * | | | | | This changes the order of the universe, black is now the new white.brian@zim.(none)2006-09-151-2/+49
| | |/ / / / /
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2006-09-151-16/+27
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1dlenev@mockturtle.local2006-09-141-16/+27
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | fix buildandrey@example.com2006-09-081-3/+0
| | * | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-runtimeahristov@bk-internal.mysql.com2006-09-061-16/+30
| | |\ \ \ \ \
| | | * | | | | WL#3337 (Event scheduler new architecture)andrey@example.com2006-09-011-11/+24
| | | * | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337andrey@example.com2006-08-141-5/+6
| | | |\ \ \ \ \
| | | | * | | | | WL #3337 (Events new architecture)andrey@lmy004.2006-07-131-1/+2
| | | | * | | | | Manual mergeandrey@lmy004.2006-07-101-5/+5
| | | | |\ \ \ \ \
| | | | | * | | | | WL #3337 (Event scheduler new architecture)andrey@lmy004.2006-07-041-1/+1
| | | | | * | | | | Mergeandrey@lmy004.2006-06-281-4/+4
| | | | | |\ \ \ \ \
| | | | | | * | | | | WL#3337 (Events new architecture)andrey@lmy004.2006-06-281-4/+4
| | | | | | * | | | | WL#3337 (Events new architecture)andrey@lmy004.2006-06-281-1/+1
* | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/work/my50-workmsvensson@shellback.(none)2006-09-151-8/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdownmsvensson@shellback.(none)2006-09-151-8/+8
| * | | | | | | | | Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfxtsmith@maint1.mysql.com2006-09-071-2/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-08-301-3/+1
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/mysql-5.1msvensson@shellback.(none)2006-09-081-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfxtsmith@maint1.mysql.com2006-09-071-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfxtsmith@maint1.mysql.com2006-09-071-2/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Bug #21054: myisam_stats_method ignored in my.cnf and cmdlinetsmith@maint1.mysql.com2006-09-071-2/+2
| * | | | | | | | | | | | Fix bad manual merge.cmiller@zippy.cornsilk.net2006-09-051-4/+0
| * | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-051-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | mysqld.cc:rburnett@production.mysql.com2006-08-211-1/+0
| | * | | | | | | | | | | | Merge production.mysql.com:/usersnfs/rburnett/tmp_mergerburnett@production.mysql.com2006-08-211-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_mergecmiller@zippy.cornsilk.net2006-08-171-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Bug #20968: incorrect DBUG_ENTER string in mysqld.cc network_init(void) functioniggy@rolltop.ignatz42.dyndns.org2006-08-031-1/+1
| * | | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-051-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | mysqld --collation-server=xxx --character-set-server=yyybar@mysql.com/bar.intranet.mysql.r18.ru2006-08-111-2/+4
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Bug#21419 test case lowercase_fs_off fails on Windowsmsvensson@neptunus.(none)2006-08-031-0/+5
| * | | | | | | | | | | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51tsmith@maint2.mysql.com2006-09-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1tnurnberg@salvation.intern.azundris.com2006-08-281-27/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maintcmiller@zippy.cornsilk.net2006-08-231-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maintcmiller@zippy.cornsilk.net2006-08-141-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Bug#18875: Default value of tmp_table_size is meaninglesscmiller@zippy.cornsilk.net2006-08-111-1/+1
* | | | | | | | | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1brian@zim.(none)2006-08-311-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Re'ordering of startup. Fixed Execution path issues. Added function for de'in...brian@zim.(none)2006-08-291-4/+3
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemergekostja@bodhi.local2006-08-301-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | / / / / / / | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |