Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge neptunus.(none):/home/msvensson/mysql/bug17039/my50-bug17039 | unknown | 2006-10-18 | 1 | -2/+13 |
|\ | |||||
| * | Bug#17039 Cursor with procedure crashes client | unknown | 2006-09-07 | 1 | -2/+13 |
* | | Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my51-bfx | unknown | 2006-09-07 | 1 | -2/+2 |
|\ \ | |||||
| * \ | Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx | unknown | 2006-09-07 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx | unknown | 2006-09-07 | 3 | -4/+3 |
| | |\ | |||||
| | | * | Bug #21054: myisam_stats_method ignored in my.cnf and cmdline | unknown | 2006-09-07 | 1 | -2/+2 |
| | | * | Bug #21250: esolve stack traces on AMD64 (backport to mysql-4.1) | unknown | 2006-09-07 | 2 | -17/+46 |
| | * | | Force conflict to avoid bk automerge behavior; will be undone during merge. | unknown | 2006-09-07 | 2 | -1/+2 |
* | | | | Merge rama.(none):/home/jimw/my/mysql-5.1-19874 | unknown | 2006-09-06 | 1 | -36/+0 |
|\ \ \ \ | |||||
| * | | | | Bug #19874: SHOW COLUMNS and SHOW KEYS handle identifiers containing \ incorr... | unknown | 2006-09-01 | 1 | -36/+0 |
* | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-maint | unknown | 2006-09-06 | 1 | -8/+7 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | New way to fix BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE". | unknown | 2006-09-06 | 1 | -8/+7 |
* | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint | unknown | 2006-09-05 | 1 | -10/+10 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge maint2.mysql.com:/data/localhome/tsmith/bk/41 | unknown | 2006-09-01 | 6 | -35/+45 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge maint2.mysql.com:/data/localhome/tsmith/bk/41 | unknown | 2006-09-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint | unknown | 2006-09-05 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Additional files for cmake support | unknown | 2006-08-31 | 2 | -0/+125 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 | unknown | 2006-08-31 | 30 | -482/+842 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2006-08-31 | 30 | -482/+842 |
| | |\ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ | Merge maint2.mysql.com:/data/localhome/tsmith/bk/g50 | unknown | 2006-08-31 | 19 | -479/+621 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 | unknown | 2006-08-29 | 1 | -0/+7 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 | unknown | 2006-08-28 | 1 | -0/+7 |
| | | |\ \ \ \ \ \ \ \ | |||||
| * | | \ \ \ \ \ \ \ \ | Merge neptunus.(none):/home/msvensson/mysql/bug21813/my50-bug21813 | unknown | 2006-08-30 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint | unknown | 2006-09-05 | 4 | -34/+40 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 | unknown | 2006-08-17 | 4 | -34/+40 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Fix for bug #20695: Charset introducer overrides charset definition for column. | unknown | 2006-08-15 | 4 | -34/+40 |
| * | | | | | | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 | unknown | 2006-08-16 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 | unknown | 2006-08-15 | 2 | -0/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1 | unknown | 2006-08-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Restore alphabetical order of the system variables. | unknown | 2006-08-14 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint | unknown | 2006-09-05 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1 | unknown | 2006-08-16 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Bug#9509: Optimizer: wrong result after AND with latin1_german2_ci comparisons | unknown | 2006-04-20 | 1 | -0/+4 |
* | | | | | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint | unknown | 2006-09-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | BUG#9678: Client library hangs after network communication failure | unknown | 2006-08-14 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Fix bad manual merge. | unknown | 2006-09-05 | 1 | -4/+0 |
* | | | | | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint | unknown | 2006-09-05 | 1 | -8/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Remove the fix for Bug#10668 "CREATE USER does not enforce username | unknown | 2006-08-30 | 1 | -8/+0 |
| * | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2006-08-30 | 30 | -474/+842 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2006-08-28 | 1 | -34/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint | unknown | 2006-09-05 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | mysqld.cc: | unknown | 2006-08-21 | 1 | -1/+0 |
| * | | | | | | | | | | | | | | | Merge production.mysql.com:/usersnfs/rburnett/tmp_merge | unknown | 2006-08-21 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 | unknown | 2006-08-21 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint | unknown | 2006-09-05 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge mysql.com:/home/hf/work/mysql-4.1.13717 | unknown | 2006-08-20 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | bug #13717 embedded library dumps warnings on STDERR directly | unknown | 2006-08-01 | 1 | -0/+7 |
| | | |_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint | unknown | 2006-09-05 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | / / / / | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | mysqld --collation-server=xxx --character-set-server=yyy | unknown | 2006-08-11 | 1 | -2/+4 |
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Removed duplicate code from bad merge. | unknown | 2006-09-05 | 1 | -13/+0 |