summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-051-0/+8
|\
| * Fixed small bug in handling of pre-4.1 TIMESTAMP columns which wasunknown2004-10-051-0/+8
* | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-051-37/+37
|\ \
| * | Fix for bug #5730 (Query cache crashes mysql)unknown2004-10-011-37/+37
* | | Bug #5832 SELECT doesn't return records in some casesunknown2004-10-055-1/+97
* | | dict0mem.h:unknown2004-10-051-5/+4
* | | Merge heikki@build.mysql.com:/home/bk/mysql-4.1unknown2004-10-051-1/+9
|\ \ \
| * \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-051-1/+9
| |\ \ \ | | |_|/ | |/| |
| | * | more and better arbitration warnings for cluster configunknown2004-10-051-1/+9
* | | | ha_innodb.cc:unknown2004-10-053-34/+41
|/ / /
* | | Merge marko@build.mysql.com:/home/bk/mysql-4.1unknown2004-10-053-6/+52
|\ \ \
| * | | Fix for bug #5555: "GROUP BY enum_field" returns incorrect resultsunknown2004-10-053-6/+52
| |/ /
* | | Merge marko@build.mysql.com:/home/bk/mysql-4.1unknown2004-10-053-12/+22
|\ \ \ | |/ /
| * | moved code out of DBUG_ASSERTunknown2004-10-051-3/+6
| * | last try didnt workunknown2004-10-052-2/+2
| * | bumped up version to 3.5.2unknown2004-10-052-9/+16
* | | InnoDB: Fix ALTER TABLE t DISCARD TABLESPACE (Bug #5851)unknown2004-10-044-8/+16
|/ /
* | lock0lock.c:unknown2004-10-041-0/+9
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-041-1/+0
|\ \
| * \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-041-1/+0
| |\ \
| | * | To allow compilation on Tru64, the MySQL code should not messunknown2004-10-041-1/+0
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-043-18/+47
|\ \ \ \ | |/ / / |/| | |
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-043-18/+47
| |\ \ \
| | * | | Made TIMESTAMP NULL columns without explicit DEFAULT value to be alwaysunknown2004-10-043-18/+47
* | | | | Comments to the single-select optimization algorithm.unknown2004-10-041-1/+24
* | | | | corrected merge error rgarding NDB_CONNECTSTRINGunknown2004-10-041-4/+5
* | | | | added debug printouts in ndbapiunknown2004-10-042-10/+26
* | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1unknown2004-10-040-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | typounknown2004-10-041-0/+1
* | | | | Mergeunknown2004-10-046-18/+29
|\ \ \ \ \ | |/ / / /
| * | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-043-17/+47
| |\ \ \ \
| | * | | | bug #5872, transactions should only be restarted with transaction.on flag off...unknown2004-10-043-17/+47
| | | |/ / | | |/| |
| * | | | A couple of typos fixed.unknown2004-10-042-3/+1
| |/ / /
| * | | sql_show.cc:unknown2004-10-041-2/+2
* | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbunknown2004-10-042-47/+42
|\ \ \ \
| * | | | addes auto pointer class for using with my_ functionsunknown2004-10-042-47/+42
* | | | | Mergeunknown2004-10-041-8/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | use new function stop_ndbclusterunknown2004-10-041-8/+1
* | | | | Mergeunknown2004-10-041-33/+37
|\ \ \ \ \ | |/ / / /
| * | | | better cleanup of cluster processes with test failureunknown2004-10-041-30/+38
* | | | | make sure old mysqld's are shutdownunknown2004-10-031-1/+4
* | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-0323-295/+1080
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | merge errorunknown2004-10-031-4/+22
| * | | | merge errorunknown2004-10-031-5/+5
| * | | | Mergeunknown2004-10-0323-320/+1087
| |\ \ \ \ | | |/ / /
| | * | | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbunknown2004-09-302-43/+15
| | |\ \ \
| | | * \ \ Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbunknown2004-09-303-43/+16
| | | |\ \ \
| | | | * \ \ Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbunknown2004-09-263-43/+16
| | | | |\ \ \
| | | | | * | | Clean up of index_name and unique_index_nameunknown2004-09-253-43/+16
| | * | | | | | Merge fixesunknown2004-09-3020-192/+848
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |