summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/data0/bk/mysql-5.0rburnett@bk-internal.mysql.com2006-07-2713-4874/+100
|\
| * Revert the change after null-merge.kroki/tomash@moonlight.intranet2006-07-271-2/+2
| * Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-releasekroki/tomash@moonlight.intranet2006-07-271-2/+2
| |\
| | * BUG#21206: memory corruption when too many cursors are opened at oncekroki/tomash@moonlight.intranet2006-07-273-7/+58
| * | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-releasekroki/tomash@moonlight.intranet2006-07-2713-4874/+100
| |\ \ | | |/
| | * "mysql-test-run.pl" must write a "Logging:" line for the evaluation of RPM bu...joerg@trift2.2006-07-251-0/+5
| | * slave.cc:grog@eucla.lemis.com2006-07-251-4/+4
| | * mysqlmanager.vcproj:kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se2006-07-223-11/+35
| | * Merge patch for bug #15195 from 5.0 -> 5.0-release (for 5.0.24)tsmith@maint1.mysql.com2006-07-217-4/+31
| | * A fix and a test case for Bug#21002 "Derived table not selecting from a kostja@bodhi.local2006-07-199-4859/+61
* | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0rburnett@bk-internal.mysql.com2006-07-252-2/+8
|\ \ \ | |/ /
| * | Merge mysql.com:/home/hf/work/mysql-4.1.mrgholyfoot/hf@mysql.com/deer.(none)2006-07-252-2/+8
| |\ \
| | * \ Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-07-202-2/+8
| | |\ \
| | | * | bug #19983 (mysql_client_test_embedded fails)holyfoot@deer.(none)2006-06-022-2/+8
* | | | | Bug#20543 select on information_schema strange warnings, view, different sche...gluh@mysql.com/gluh.(none)2006-07-256-21/+127
* | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0gluh@mysql.com/gluh.(none)2006-07-257-42/+65
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0rburnett@bk-internal.mysql.com2006-07-247-42/+65
| |\ \ \ \
| | * \ \ \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-ktholyfoot/hf@mysql.com/deer.(none)2006-07-211-2/+11
| | |\ \ \ \
| | | * | | | bug #20950 (mysql_upgrade looks for 'mysqlcheck' not for 'mysqlcheck.exe'holyfoot/hf@mysql.com/deer.(none)2006-07-211-2/+11
| | * | | | | Merge bk@192.168.21.1:mysql-5.0-ktholyfoot/hf@mysql.com/deer.(none)2006-07-211-13/+13
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | bug #19672 (paths in embedded server are trucated in error messages)holyfoot@deer.(none)2006-06-201-13/+13
| | * | | | | Merge bk-internal:/home/bk/mysql-5.0-ktjimw@rama.(none)2006-07-184-25/+37
| | |\ \ \ \ \
| | | * | | | | Bug #12673: Instance Manager: allows to stop the instance many timesjimw@rama.(none)2006-07-124-25/+37
| | * | | | | | Merge bk-internal:/home/bk/mysql-5.0-ktjimw@rama.(none)2006-07-171-2/+4
| | |\ \ \ \ \ \
| | | * | | | | | Bug #17485: mysql client crashes when connecting to the Instance Managerjimw@rama.(none)2006-07-111-2/+4
* | | | | | | | | Merge trift2.:/M41/clone-4.1joerg@trift2.2006-07-2411-0/+213
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bug #21135 Crash in test "func_time"msvensson@neptunus.(none)2006-07-192-24/+24
| * | | | | | | | | Changes to make "sql/sql_locale.cc" compile + link on Windows:joerg@trift2.2006-07-1712-109/+322
* | | | | | | | | | Merge trift2.:/M41/push-1-4.1joerg@trift2.2006-07-241-2/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | strings/strtod.c : Ensure the definition of "EOVERFLOW" is available.joerg@trift2.2006-07-171-1/+1
* | | | | | | | | | Merge trift2.:/M41/tmp_mergejoerg@trift2.2006-07-241-0/+3
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | mysql.spec.sh:kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se2006-07-191-0/+3
| * | | | | | | | Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1evgen@moonbone.local2006-07-1817-25/+268
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Backporting Kostja's changes made for 5.0 into 4.1.bar@mysql.com/bar.intranet.mysql.r18.ru2006-07-182-111/+112
| * | | | | | | | | Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41pekka@orca.ndb.mysql.com2006-07-151-1/+1
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge trift2.:/M41/tmp_mergejoerg@trift2.2006-07-241-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | mysql.spec.sh:kent@mysql.com/g4-2.local2006-07-151-1/+0
| * | | | | | | | | | Increment the version number to 4.1.22, as 4.1.21 is cloned.joerg@trift2.2006-07-141-2/+2
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge bk://anubis/mysql-5.0-enginesacurtis/antony@xiphis.org/ltantony.xiphis.org2006-07-2110-191/+199
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | "BUG #18764: Delete conditions causing inconsistencies in Federated tables"patg@govinda.patg.net2006-07-183-4/+5
| * | | | | | | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0-enginespatg@govinda.patg.net2006-07-183-67/+119
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | "BUG #18764: Delete conditions causing inconsistencies in Federated tables"patg@govinda.patg.net2006-07-173-66/+118
| * | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-enginesjimw@rama.(none)2006-07-185-2/+38
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0-enginesjimw@rama.(none)2006-07-115-2/+38
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Bug #17766: The server accepts to create MERGE tables which cannot workjimw@rama.(none)2006-07-115-2/+38
| * | | | | | | | | | | | | Bug #17608: String literals lost during INSERT query on FEDERATED tablejimw@rama.(none)2006-07-125-133/+52
* | | | | | | | | | | | | | Finish the merge of the patch for bug #15195 from 4.1 -> 5.0tsmith/tim@siva.hindu.god2006-07-203-2/+12
* | | | | | | | | | | | | | Partial merge of the patch for bug #15195 from 4.1 -> 5.0; more changes neededtsmith/tim@siva.hindu.god2006-07-206-3/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil/ram@mysql.com/myoffice.izhnet.ru2006-07-147-6/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | --{skip-}merge option added which allows the user to disable merge engine andramil/ram@mysql.com/myoffice.izhnet.ru2006-07-147-6/+26