summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge naruto.:C:/cpp/bug20789/my50-bug20789Kristofer.Pettersson@naruto.2006-09-123-0/+78
|\
| * Bug#20789 Merge Subtable Rename Causes CrashKristofer.Pettersson@naruto.2006-09-123-0/+78
* | Change stolen from the -win tree.cmiller@maint1.mysql.com2006-09-121-0/+3
* | Use the mtr_file_exists function to detect if ndbapi_example is availablemsvensson@shellback.(none)2006-09-111-3/+2
* | "crash_commit_before" need innodbmsvensson@shellback.(none)2006-09-081-0/+1
* | Merge shellback.(none):/home/msvensson/mysql/mysql-5.1msvensson@shellback.(none)2006-09-08219-9767/+11460
|\ \
| * \ Merge bk-internal:/home/bk/mysql-5.1-new-maintmsvensson@shellback.(none)2006-09-08228-9347/+11472
| |\ \
| | * | make partition_mgm test deterministic wrt results of lstnurnberg@mysql.com/salvation.intern.azundris.com2006-09-071-2/+6
| | * | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-mainttnurnberg@salvation.intern.azundris.com2006-09-075-41/+38
| | |\ \
| | | * \ Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my51-bfxtsmith@maint1.mysql.com2006-09-071-2/+2
| | | |\ \
| | | | * \ Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfxtsmith@maint1.mysql.com2006-09-071-2/+2
| | | | |\ \
| | | | | * \ Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfxtsmith@maint1.mysql.com2006-09-073-4/+3
| | | | | |\ \
| | | | | | * | Bug #21054: myisam_stats_method ignored in my.cnf and cmdlinetsmith@maint1.mysql.com2006-09-071-2/+2
| | | | | | * | Bug #21250: esolve stack traces on AMD64 (backport to mysql-4.1)tsmith@maint1.mysql.com2006-09-072-17/+46
| | | | | * | | Force conflict to avoid bk automerge behavior; will be undone during merge.tsmith@maint1.mysql.com2006-09-072-1/+2
| | | * | | | | Merge bk-internal:/home/bk/mysql-5.1-new-maintjimw@rama.(none)2006-09-061-3/+8
| | | |\ \ \ \ \
| | | | * | | | | Fix build problem for when not compiled with debugging.cmiller@zippy.cornsilk.net2006-09-061-3/+8
| | | * | | | | | Merge rama.(none):/home/jimw/my/mysql-5.1-19874jimw@rama.(none)2006-09-063-36/+28
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Bug #19874: SHOW COLUMNS and SHOW KEYS handle identifiers containing \ incorr...jimw@rama.(none)2006-09-013-36/+28
| | * | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-mainttnurnberg@salvation.intern.azundris.com2006-09-067-162/+190
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Fix merge problems; work around disparate "ls" behaviors.cmiller@zippy.cornsilk.net2006-09-063-19/+11
| | | * | | | | | mi_test_all.sh needs "./" before the executable names otherwise theyguilhem@gbichot3.local2006-09-061-128/+128
| | | * | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-maintguilhem@gbichot3.local2006-09-063-15/+51
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | | * | | | | New way to fix BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE".guilhem@gbichot3.local2006-09-063-15/+51
| | * | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-mainttnurnberg@salvation.intern.azundris.com2006-09-063-1/+36
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-mainttnurnberg@salvation.intern.azundris.com2006-09-053-1/+36
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge salvation.intern.azundris.com:/home/tnurnberg/21913/my50-21913tnurnberg@salvation.intern.azundris.com2006-09-053-1/+36
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ Merge salvation.intern.azundris.com:/home/tnurnberg/21913/my41-21913tnurnberg@salvation.intern.azundris.com2006-09-043-1/+36
| | | | | |\ \ \ \ \ \ | | | | | | |_|_|/ / / | | | | | |/| | | | |
| | | | | | * | | | | Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-conne...tnurnberg@salvation.intern.azundris.com2006-09-043-1/+36
| | | | | | | |_|/ / | | | | | | |/| | |
| | * | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-050-0/+0
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/mtr/my50-mtrmsvensson@shellback.(none)2006-09-012-1/+7
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-050-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0jonas@perch.ndb.mysql.com2006-09-0196-1156/+3284
| | | |\ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-053-12/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge maint2.mysql.com:/data/localhome/tsmith/bk/41tsmith@maint2.mysql.com2006-09-0112-46/+147
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-050-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintjimw@rama.(none)2006-08-313-207/+256
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-051-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | post-merge fixtsmith@maint2.mysql.com2006-09-011-0/+1
| | * | | | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-051-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/41tsmith@maint2.mysql.com2006-09-012-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-058-0/+157
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Additional files for cmake supportgeorg@lmy002.wdf.sap.corp2006-08-3128-0/+957
| | | | |_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-051-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | make DNS based hostname queries work (bug #17582)hartmut@mysql.com/linux.site2006-08-301-2/+2
| | | * | | | | | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0jonas@perch.ndb.mysql.com2006-08-3044-526/+1189
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0jonas@perch.ndb.mysql.com2006-08-2525-88/+125
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-056-34/+62
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil/ram@mysql.com/myoffice.izhnet.ru2006-08-176-34/+63
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | Fix for bug #20695: Charset introducer overrides charset definition for column.ramil/ram@mysql.com/myoffice.izhnet.ru2006-08-156-34/+63
View Lorry Controller Status