summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Expand)AuthorAgeFilesLines
* Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.(none)2007-06-211-1/+9
|\
| * Bug#24924: shared-memory-base-name that is too long causes buffer overflowtnurnberg@sin.intern.azundris.com2007-06-211-1/+9
* | Embedded Server doesn't build on Windows.iggy@alf.2007-06-151-1/+1
* | Merge xp.:C:/work/mysql-5.1-new-maint/..\mysql-5.0-maint"Reggie"/Reggie@xp.2007-06-071-3/+3
|\ \ | |/
| * Bug #24731 Shared memory connections do not work with MySql ran as service on..."Reggie"/Reggie@xp.2007-06-071-3/+3
| * Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664msvensson@pilot.blaudden2007-05-241-4/+2
| |\
* | \ Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51tsmith@quadxeon.mysql.com2007-06-053-18/+16
|\ \ \
| * \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-05-243-18/+16
| |\ \ \
| | * | | WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-103-18/+16
* | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664msvensson@pilot.blaudden2007-05-241-4/+2
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Bug#26664 test suite times out on OS X 64bitmsvensson@pilot.blaudden2007-05-241-4/+2
* | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50tsmith@quadxeon.mysql.com2007-05-181-1/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | my_time.c:tsmith@quadxeon.mysql.com2007-05-181-0/+1
| * | Backport of TIME->MYSQL_TIME / Y2K fixsetmsvensson@pilot.blaudden2007-05-161-1/+33
| |/
| * Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my50-bug24121msvensson@pilot.blaudden2007-03-291-1/+1
| |\
| * \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-03-261-5/+2
| |\ \
* | | | Clear field_alloc when it's moved to result set (allows us to always call fre...monty@mysql.com/narttu.mysql.fi2007-04-161-1/+3
* | | | Added more descriptive error message of why statement was automaticly droppedmonty@mysql.com/narttu.mysql.fi2007-04-131-2/+10
* | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@ua141d10.elisa.omakaista.fi2007-04-101-17/+45
|\ \ \ \
| * | | | Fixed error found by valgrind in numerical date handlingmonty@mysql.com/narttu.mysql.fi2007-03-261-11/+12
| * | | | Removed not used define YY_MAGIC_BELOWmonty@mysql.com/narttu.mysql.fi2007-03-231-6/+33
* | | | | Bug #24121 Incorrect test for SSL_VERIFY_SERVER_CERTmsvensson@pilot.blaudden2007-03-271-1/+1
* | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my50-bug24121msvensson@pilot.blaudden2007-03-271-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Bug#24121 Incorrect test for SSL_VERIFY_SERVER_CERTmsvensson@pilot.blaudden2007-03-271-1/+1
| | |/ / | |/| |
| * | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-03-051-1/+1
| |\ \ \
| * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-02-212-30/+31
| |\ \ \ \
* | \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maintramil/ram@ramil.myoffice.izhnet.ru2007-03-261-5/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Merge mysql.com:/home/ram/work/b25301/b25301.5.0ramil/ram@ramil.myoffice.izhnet.ru2007-02-081-5/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge mysql.com:/home/ram/work/b25301/b25301.4.1ramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-02-081-5/+2
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Fix for bug #25301: Non-zero dates with year 0000 are invalidramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-02-081-4/+1
* | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maintramil/ram@ramil.myoffice.izhnet.ru2007-03-051-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge mysql.com:/home/ram/work/b23616/b23616.5.0ramil/ram@ramil.myoffice.izhnet.ru2007-03-021-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge mysql.com:/home/ram/work/b23616/b23616.4.1ramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-03-021-1/+1
| | |\ \ \ \
| | | * | | | Fix for bug #23616: Week() changed behaviour between 5.0.22 and 5.0.24ramil/ram@mysql.com/ramil.myoffice.izhnet.ru2006-12-261-1/+1
* | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1msvensson@neptunus.(none)2007-02-062-31/+32
|\ \ \ \ \ \ \
| * | | | | | | Fixed problems detected by pushbuildmonty@mysql.com/narttu.mysql.fi2007-01-301-1/+1
| * | | | | | | Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-272-30/+31
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-222-30/+31
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-152-30/+31
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | | * | | | | Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-152-30/+31
* | | | | | | | | Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943msvensson@pilot.mysql.com2007-01-291-1/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943msvensson@pilot.mysql.com2007-01-291-1/+7
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| | * | | | | Bug#22943 syscall pruning in libmysqlmsvensson@pilot.mysql.com2007-01-291-1/+7
| | | |_|_|/ | | |/| | |
| | * | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2006-11-281-0/+2
| | |\ \ \ \
| | * \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2006-11-241-9/+115
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintramil/ram@mysql.com/myoffice.izhnet.ru2006-11-221-1/+4
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-312-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | my_strtoll10-x86.s:kent@mysql.com/kent-amd64.(none)2006-12-312-2/+2
* | | | | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-235-10/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-235-10/+5
| | |_|_|_|/ / | |/| | | | |