summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0istruewing@chilla.local2007-01-03539-1250/+2882
|\
| * view.result:kent@mysql.com/kent-amd64.(none)2007-01-021-4/+4
| * Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com/kent-amd64.(none)2006-12-31524-1212/+2726
| |\
| | * my_strtoll10-x86.s:kent@mysql.com/kent-amd64.(none)2006-12-31524-1212/+2726
| * | Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndbstewart@willster.(none)2006-12-285-20/+15
| |\ \
| | * | BUG#22299 mgmd crash due to unchecked TransporterFacade::ThreadData expand()stewart@willster.(none)2006-11-031-0/+2
| | * | BUG#22301 ndb: File_class::size() is not thread safestewart@willster.(none)2006-10-273-13/+12
| | * | BUG#22310 dead/deceptive code in FileLogHandler::writeFooter() and File_class...stewart@willster.(none)2006-10-272-7/+1
| * | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0tomas@poseidon.mysql.com2006-12-279-14/+137
| |\ \ \
| | * \ \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2006-12-156-13/+113
| | |\ \ \
| | | * | | ndb - bug#25059jonas@perch.ndb.mysql.com2006-12-155-13/+81
| | | * | | ndb - bug#25090jonas@perch.ndb.mysql.com2006-12-152-0/+30
| | | * | | ndb - bug#25090jonas@perch.ndb.mysql.com2006-12-151-0/+2
| | * | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0mskold/marty@mysql.com/linux.site2006-12-072-0/+23
| | |\ \ \ \
| | | * \ \ \ Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1mskold/marty@mysql.com/linux.site2006-12-072-0/+23
| | | |\ \ \ \
| | | | * | | | Bug#24818 CREATE UNIQUE INDEX (...) USING HASH on a NDB table crashes mysqld:...mskold/marty@mysql.com/linux.site2006-12-072-0/+23
| | * | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2006-12-061-1/+1
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | ndb - bug#22773jonas@perch.ndb.mysql.com2006-12-061-1/+1
* | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG23526/mysql-5.0-engines2svoj@mysql.com/april.(none)2006-12-305-2/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | BUG#23526 - show table status reports incorrect values for MyISAM tablessvoj@mysql.com/april.(none)2006-12-055-2/+22
* | | | | | | | | Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-enginessvoj@mysql.com/april.(none)2006-12-303-4/+5
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-enginessvoj@mysql.com/april.(none)2006-12-303-4/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | BUG#23196 - MySQL server does not exit / shutdown whensvoj@mysql.com/april.(none)2006-12-013-4/+5
* | | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-enginessvoj@mysql.com/june.mysql.com2006-12-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-enginessvoj@mysql.com/june.mysql.com2006-12-294-73/+95
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-enginessvoj@mysql.com/april.(none)2006-12-274-73/+95
| | |\ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-enginessvoj@mysql.com/june.mysql.com2006-12-291802-3620/+1874
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-enginesistruewing@chilla.local2006-12-271-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-4.1-enginessvoj@mysql.com/june.mysql.com2006-12-271-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-enginessvoj@mysql.com/june.mysql.com2006-12-271-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | BUG#24358 - Table access crashes serversvoj@mysql.com/april.(none)2006-12-151-0/+2
| * | | | | | | | | | | | | Merge xiphis.org:/home/antony/work2/mysql-5.0-enginesacurtis/antony@xiphis.org/ltamd64.xiphis.org2006-12-261802-3620/+1872
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | * | | | | | | | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-231802-3620/+1872
* | | | | | | | | | | | | After merge fix.svoj@mysql.com/april.(none)2006-12-271-3/+5
* | | | | | | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-enginessvoj@mysql.com/april.(none)2006-12-2743-129/+435
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | BUG#25048 - ERROR 126 : Incorrect key file for table '.XXXX.MYI'; try tosvoj@mysql.com/june.mysql.com2006-12-264-7/+44
| * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0istruewing@chilla.local2006-12-2134-115/+377
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | configure.in : Update of the NDB version number was missing, do it.joerg@trift2.2006-12-211-1/+1
| | * | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0joerg/mysqldev@bk-internal.mysql.com2006-12-2033-114/+376
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix silly typos in the disabling of "im_daemon_life_cycle" (bug#24415).joerg@trift2.2006-12-201-1/+1
| | | * | | | | | | | | | | Merge trift2.:/MySQL/M50/clone-5.0joerg@trift2.2006-12-201-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Disable test "im_deamon_life_cycle", Bug#24425, see note: [19 Dec 23:17] Trud...joerg@trift2.2006-12-201-0/+1
| | | * | | | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/50-releasetsmith/tim@siva.hindu.god2006-12-193-3/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | Remove warnings by castingtsmith/tim@siva.hindu.god2006-12-193-3/+4
| | | * | | | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/50-releasetsmith/tim@siva.hindu.god2006-12-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/50-releasetsmith/tim@siva.hindu.god2006-12-1811-81/+151
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/50-24200tsmith/tim@siva.hindu.god2006-12-1913-2/+144
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Added innodb_rollback_on_timeout option to restore the 4.1 tsmith/tim@siva.hindu.god2006-12-1913-2/+144
| | | * | | | | | | | | | | | | | Alternative decimal2double implementation using an algorithmtsmith/tim@siva.hindu.god2006-12-191-8/+26
| | | * | | | | | | | | | | | | | Bug #24947: REPEAT function returns NULL when passed a field as the count par...tsmith/tim@siva.hindu.god2006-12-193-20/+39
| | | |/ / / / / / / / / / / / /