summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2007-06-062-5/+0
|\
| * Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2007-06-051-0/+5
| |\
| * \ Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2007-06-043-33/+55
| |\ \
| * \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1joerg@debian.(none)2007-06-012-5/+0
| |\ \ \
| | * | | sql_parse.cc, config-win.h, config-netware.h:kent@mysql.com/kent-amd64.(none)2007-05-272-5/+0
* | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1tsmith@quadxeon.mysql.com2007-06-051-0/+5
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optigor@olga.mysql.com2007-06-041-0/+5
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Bug #26162: Trigger DML ignores low_priority_updates settinggkodinov/kgeorge@macbook.gmz2007-06-031-0/+5
| | * | | Merge mysql.com:/home/svoj/devel/bk/mysql-5.0svoj@mysql.com/june.mysql.com2007-05-231-1/+1
| | |\ \ \
* | | \ \ \ Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51tsmith@quadxeon.mysql.com2007-06-0530-564/+575
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.(none)2007-06-0130-531/+520
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@linux-th5m.site2007-05-2430-531/+520
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-05-2430-531/+520
| | | |\ \ \
| | | | * | | WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-1030-531/+520
| * | | | | | Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimelars/lthalmann@dl145j.mysql.com2007-05-311-0/+3
| |\ \ \ \ \ \
| | * | | | | | Define HAVE_STRNLEN correctly.bar@mysql.com/bar.myoffice.izhnet.ru2007-05-301-0/+3
| | |/ / / / /
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@vajra.(none)2007-05-243-33/+52
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | build break cleanupmalff/marcsql@weblab.(none)2007-05-222-9/+8
| | * | | | | Bug#21554 (sp_cache.cc: violates C++ aliasing rules)malff/marcsql@weblab.(none)2007-05-222-26/+46
* | | | | | | Merge polly.local:/home/kaa/src/maint/bug28121/my51-bug28121kaa@polly.local2007-05-311-1/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121kaa@polly.local2007-05-311-1/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Got rid of log_01[], because we don't really need it. Division and log_10[] c...kaa@polly.local2007-05-301-1/+0
* | | | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51tsmith@quadxeon.mysql.com2007-05-302-1/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge mysql.com:/home/svoj/devel/bk/mysql-5.1svoj@june.mysql.com2007-05-232-1/+7
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-enginessvoj@june.mysql.com2007-05-171-1/+1
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-enginessvoj@mysql.com/june.mysql.com2007-05-171-1/+1
| | | |\ \ \ \ \
| | | | * | | | | Addition to fix forsvoj@mysql.com/june.mysql.com2007-05-171-1/+1
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesistruewing@chilla.local2007-05-101-0/+6
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Merge chilla.local:/home/mydev/mysql-5.1-bug17332-oldistruewing@chilla.local2007-03-201-0/+6
| | | |\ \ \ \ \ \
| | | | * | | | | | Bug#17332 - changing key_buffer_size on a running serveristruewing@chilla.local2007-01-311-0/+6
* | | | | | | | | | Merge polly.local:/home/kaa/src/maint/mysql-5.0-maintkaa@polly.local2007-05-281-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Some Windows-related fixes to make Microsoft compilers happy. This is for bug...kaa@polly.local2007-05-281-2/+2
| * | | | | | | | | Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121kaa@polly.local2007-05-281-0/+4
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge polly.local:/home/kaa/src/maint/bug28121/my51-bug28121kaa@polly.local2007-05-281-0/+4
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121kaa@polly.local2007-05-281-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | / / | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| | * | | | | | | | | Fix for bug #28121 "INSERT or UPDATE into DOUBLE(200,0) field being truncated...kaa@polly.local2007-05-281-0/+4
* | | | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-05-251-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Bug #26664 test suite times out on OS X 64bitmsvensson@pilot.blaudden2007-05-251-0/+2
| * | | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664msvensson@pilot.blaudden2007-05-242-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Merge siva.hindu.god:/home/tsmith/m/bk/50tsmith@siva.hindu.god2007-05-171-0/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug #27957 cast as decimal does not check overflow, also inconsistent with gr...holyfoot/hf@mysql.com/hfmain.(none)2007-05-091-0/+1
| | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Backport of TIME->MYSQL_TIME / Y2K fixsetmsvensson@pilot.blaudden2007-05-161-0/+1
| * | | | | | | | | | Fix for bug #28240: "isinf()" cannot be used in C++ for lack of prototypemsvensson@pilot.blaudden2007-05-161-6/+5
| |/ / / / / / / / /
* | | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664msvensson@pilot.blaudden2007-05-242-1/+3
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Bug#26664 test suite times out on OS X 64bitmsvensson@pilot.blaudden2007-05-242-1/+3
* | | | | | | | | | Fix for bug #23810: Server crashes on various "show status ..." commandsramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-05-231-0/+3
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge siva.hindu.god:/home/tsmith/m/bk/51tsmith@siva.hindu.god2007-05-178-8/+351
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesacurtis/antony@ltamd64.xiphis.org2007-05-048-8/+351
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | WL#2936acurtis/antony@xiphis.org/ltamd64.xiphis.org2007-05-011-2/+3
| | * | | | | | | WL#2936acurtis/antony@xiphis.org/ltamd64.xiphis.org2007-04-301-13/+13