summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Protect DBUG_ENTER printout from NULL pointersunknown2007-02-141-1/+3
* Merge bk-internal:/home/bk/mysql-5.1-maintunknown2007-02-141-0/+28
|\
| * Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maintunknown2007-02-131-0/+27
| |\
| | * Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maintunknown2007-02-131-0/+27
| | |\
| | | * Write some debug info to result log file before dying in 'do_exec'unknown2007-02-131-0/+27
| * | | Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maintunknown2007-02-131-0/+1
| |\ \ \ | | |/ /
| | * | Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maintunknown2007-02-131-0/+1
| | |\ \ | | | |/
| | | * Reset value of variable "escaped" in "default" label causing $variables notunknown2007-02-131-0/+1
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-02-130-0/+0
|\ \ \ \
| * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-02-130-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | .del-README.txt-renamed:unknown2007-02-130-0/+0
* | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25807/my50-bug25807unknown2007-02-132-6/+37
|\ \ \ \ \
| * | | | | Bug#25807: LOAD DATA INFILE does not work with Pipesunknown2007-02-132-6/+37
* | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2007-02-131-33/+33
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-02-131-33/+33
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Reverting previous change from 1L -> 1ULL and LL(1) -> 1ULL and unknown2007-02-021-33/+33
* | | | | Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maintunknown2007-02-132-1/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0unknown2007-02-13220-1/+719246
| |\ \ \ \
| * \ \ \ \ Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maintunknown2007-02-132-1/+7
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2007-02-124-33/+86
| | |\ \ \ \
| | * \ \ \ \ Merge siva.hindu.god:/home/tsmith/m/bk/41unknown2007-02-0838-95/+380
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-02-085-9/+58
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb-bjunknown2007-02-011-0/+12
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-ndb-bjunknown2006-12-141-0/+12
| | | | |\ \ \ \ \ \
| | * | | | | | | | | Test and bug fixes and removed unneccessary files.unknown2007-02-053-1/+9
| * | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-02-124-33/+86
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/tnurnberg/24660/41-24660unknown2007-02-124-33/+86
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Bug#24660: "enum" field type definition problemunknown2007-02-124-33/+86
| * | | | | | | | | | | Merge siva.hindu.god:/home/tsmith/m/bk/50unknown2007-02-088-15/+110
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.1unknown2007-02-13514-0/+2007086
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0unknown2007-02-124-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-02-098-15/+110
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | make_binary_distribution.sh:unknown2007-02-091-0/+1
| | * | | | | | | | | | | Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-02-07219-0/+719244
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | copy from test-extra-5.0 to main treeunknown2007-02-06219-0/+719244
| * | | | | | | | | | | | | Merge clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-mergeunknown2007-02-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-02-088-15/+110
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2007-02-076-13/+40
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0unknown2007-02-076-13/+40
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2007-02-022-0/+19
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge dev3-63.(none):/home/zhl/mysql/tree-merge/5.0/mysql-5.0-ndb-bjunknown2007-02-012-0/+19
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bjunknown2006-12-141-0/+12
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bjunknown2006-12-141-0/+7
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | BUG#21033 The error log of mysqld shows useless information, and hides the r...unknown2006-11-291-0/+7
| | | * | | | | | | | | | | | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0unknown2007-02-013-2/+51
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2007-02-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2007-02-09510-0/+2007079
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1unknown2007-02-09510-0/+2007079
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | updates caused by 5.1.16unknown2007-02-0812-38/+77
| | * | | | | | | | | | | | | | | | | | copy from test-extra-5.1 to main treeunknown2007-02-06510-0/+2007041