summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/usr/home/bar/mysql-5.1-newbar@mysql.com2006-04-113-0/+31
|\
| * Bug#18285: ExtractValue not returning character data within <![CDATA[]]> as e...bar@mysql.com2006-04-073-0/+31
* | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newbar@mysql.com2006-04-114-39/+70
|\ \
| * | Bug#16233: XML: ExtractValue() fails with special charactersbar@mysql.com2006-04-114-39/+70
* | | Merge mysql.com:/home/jimw/my/mysql-5.0-cleanjimw@mysql.com2006-04-108-38/+74
|\ \ \
| * \ \ Merge bk-internal:/home/bk/mysql-5.0jimw@mysql.com2006-04-108-39/+75
| |\ \ \
| | * \ \ Merge bk-internal:/home/bk/mysql-5.0jimw@mysql.com2006-04-108-39/+75
| | |\ \ \
| | | * \ \ Merge mysql.com:/home/jimw/my/mysql-5.0-13601jimw@mysql.com2006-04-108-39/+75
| | | |\ \ \
| | | | * | | Bug #13601: Wrong int type for bitjimw@mysql.com2006-04-048-39/+75
* | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-newigor@rurik.mysql.com2006-04-1044-7445/+6
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newbrian@zim.(none)2006-04-101-3/+3
| |\ \ \ \ \ \ \
| | * | | | | | | mysql_upgrade.c:kent@mysql.com2006-04-111-3/+3
| * | | | | | | | Drop a number of OS2 specific files. brian@zim.(none)2006-04-1043-7442/+3
| |/ / / / / / /
* | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-newigor@rurik.mysql.com2006-04-108-483/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-newkent@mysql.com2006-04-118-483/+16
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Mergekent@mysql.com2006-04-118-483/+16
| | |\ \ \ \ \ \ \
| | | * | | | | | | disabled.def:kent@mysql.com2006-04-101-0/+5
| | | * | | | | | | mysql-test-run.pl:kent@mysql.com2006-04-102-8/+4
| | | * | | | | | | Merge mysqldev@production.mysql.com:my/mysql-5.1-releasekent@mysql.com2006-04-086-475/+8
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release.old03kent@mysql.com2006-04-086-475/+8
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | make_binary_distribution.sh:kent@mysql.com2006-03-273-479/+4
| | | | | * | | | | | | azio.c, archive_test.c:kent@mysql.com2006-03-262-3/+3
| | | | | * | | | | | | Merge mysqldev@production.mysql.com:my/mysql-5.1-releasekent@mysql.com2006-03-251-1/+1
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | Makefile.am:kent@mysql.com2006-03-251-1/+1
| | | * | | | | | | | | | Merge mysql.com:/M50/mtr-5.0 into mysql.com:/M51/clone-5.1joerg@mysql.com2006-04-071-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge mysql.com:/M50/clone-5.0 into mysql.com:/M51/clone-5.1joerg@mysql.com2006-04-071-1/+5
| | | |\ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0igor@rurik.mysql.com2006-04-107-9/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | / / / / / / | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Made the test case for bug #15917 independent on platforms.igor@rurik.mysql.com2006-04-102-2/+2
| * | | | | | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0igor@rurik.mysql.com2006-04-103-2/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Fixed bug #16069.igor@rurik.mysql.com2006-04-083-2/+43
| * | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0knielsen@mysql.com2006-04-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/usr/local/mysql/mysql-5.0-fixcastknielsen@mysql.com2006-04-101-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fix test case 'cast' on Windows, different floating point output format.knielsen@mysql.com2006-04-101-0/+2
| * | | | | | | | | | | | | | Merge mysql.com:/usr/local/mysql/mysql-4.1-vgfixknielsen@mysql.com2006-04-101-5/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | $MYSQL_TEST was broken with --valgrind.knielsen@mysql.com2006-04-081-5/+11
* | | | | | | | | | | | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-newreggie@big_geek.2006-04-101-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix cmake generation errorreggie@big_geek.2006-04-101-2/+8
* | | | | | | | | | | | | | | | manual mergemikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se2006-04-1010-50/+681
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-newgluh@mysql.com2006-04-111-42/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-newlars@mysql.com2006-04-101-42/+43
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Updated disable.def file with BUG numbers, time of disable and disablerlars@mysql.com2006-04-101-42/+43
| * | | | | | | | | | | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-newgluh@mysql.com2006-04-116-2/+598
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newholyfoot@mysql.com2006-04-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/alexi/bugs/mysql-5.0-tempaivanov@mysql.com2006-04-100-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | / / / / / / / / / / / | | | | | |_|_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge mysql.com:/home/alexi/bugs/mysql-5.0-15868aivanov@mysql.com2006-04-101-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | Fixed test case result (after BUG#15868 fix).aivanov@mysql.com2006-04-101-1/+1
| | | | * | | | | | | | | | | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0aivanov@mysql.com2006-04-101-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0jonas@perch.ndb.mysql.com2006-04-1014-11/+177
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / / / | | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-jonasjonas@perch.ndb.mysql.com2006-04-1018-48/+149
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2006-04-1022-241/+1740
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \