summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge neptunus.(none):/home/msvensson/mysql/bug17039/my50-bug17039unknown2006-10-181-2/+13
|\
| * Bug#17039 Cursor with procedure crashes clientunknown2006-09-071-2/+13
* | Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my51-bfxunknown2006-09-071-2/+2
|\ \
| * \ Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfxunknown2006-09-071-2/+2
| |\ \ | | |/
| | * Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfxunknown2006-09-073-4/+3
| | |\
| | | * Bug #21054: myisam_stats_method ignored in my.cnf and cmdlineunknown2006-09-071-2/+2
| | | * Bug #21250: esolve stack traces on AMD64 (backport to mysql-4.1)unknown2006-09-072-17/+46
| | * | Force conflict to avoid bk automerge behavior; will be undone during merge.unknown2006-09-072-1/+2
* | | | Merge rama.(none):/home/jimw/my/mysql-5.1-19874unknown2006-09-061-36/+0
|\ \ \ \
| * | | | Bug #19874: SHOW COLUMNS and SHOW KEYS handle identifiers containing \ incorr...unknown2006-09-011-36/+0
* | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2006-09-061-8/+7
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | New way to fix BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE".unknown2006-09-061-8/+7
* | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-051-10/+10
|\ \ \ \ \
| * \ \ \ \ Merge maint2.mysql.com:/data/localhome/tsmith/bk/41unknown2006-09-016-35/+45
| |\ \ \ \ \
| * \ \ \ \ \ Merge maint2.mysql.com:/data/localhome/tsmith/bk/41unknown2006-09-011-1/+1
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-051-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Additional files for cmake supportunknown2006-08-312-0/+125
| |/ / / / / / /
| * | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0unknown2006-08-3130-482/+842
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-08-3130-482/+842
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge maint2.mysql.com:/data/localhome/tsmith/bk/g50unknown2006-08-3119-479/+621
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2006-08-291-0/+7
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2006-08-281-0/+7
| | | |\ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/bug21813/my50-bug21813unknown2006-08-301-2/+4
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-054-34/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-08-174-34/+40
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fix for bug #20695: Charset introducer overrides charset definition for column.unknown2006-08-154-34/+40
| * | | | | | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-08-161-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-08-152-0/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1unknown2006-08-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Restore alphabetical order of the system variables.unknown2006-08-141-1/+1
* | | | | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-051-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1unknown2006-08-161-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Bug#9509: Optimizer: wrong result after AND with latin1_german2_ci comparisonsunknown2006-04-201-0/+4
* | | | | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | BUG#9678: Client library hangs after network communication failureunknown2006-08-141-1/+1
* | | | | | | | | | | | | | | | Fix bad manual merge.unknown2006-09-051-4/+0
* | | | | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-051-8/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Remove the fix for Bug#10668 "CREATE USER does not enforce username unknown2006-08-301-8/+0
| * | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-08-3030-474/+842
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-08-281-34/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-051-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | mysqld.cc:unknown2006-08-211-1/+0
| * | | | | | | | | | | | | | | Merge production.mysql.com:/usersnfs/rburnett/tmp_mergeunknown2006-08-211-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2006-08-211-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-051-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge mysql.com:/home/hf/work/mysql-4.1.13717unknown2006-08-201-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | bug #13717 embedded library dumps warnings on STDERR directlyunknown2006-08-011-0/+7
| | | |_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-051-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | / / / / | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | mysqld --collation-server=xxx --character-set-server=yyyunknown2006-08-111-2/+4
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Removed duplicate code from bad merge.unknown2006-09-051-13/+0