summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge trift2.:/MySQL/M41/spec-4.1joerg@trift2.2006-12-141-0/+7
|\ | | | | | | into trift2.:/MySQL/M50/spec-5.0
| * support-files/mysql.spec.shjoerg@trift2.2006-12-141-0/+7
| | | | | | | | The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".
* | Merge mysql.com:/home/gluh/MySQL/Merge/4.1-optgluh@mysql.com/gluh.(none)2006-12-120-0/+0
|\ \ | |/ | | | | into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
| * Merge mysql.com:/home/gluh/MySQL/Merge/4.1gluh@mysql.com/gluh.(none)2006-12-116-55/+93
| |\ | | | | | | | | | into mysql.com:/home/gluh/MySQL/Merge/4.1-opt
| * \ Merge bk-internal:/home/bk/mysql-4.1-maintmsvensson@neptunus.(none)2006-12-050-0/+0
| |\ \ | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
| * \ \ Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836iggy@rolltop.ignatz42.dyndns.org2006-12-051-8/+0
| |\ \ \ | | | | | | | | | | | | | | | into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
| * \ \ \ Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836iggy@rolltop.ignatz42.dyndns.org2006-12-044-28/+147
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
* | \ \ \ \ Merge mysql.com:/home/gluh/MySQL/Merge/5.0gluh@mysql.com/gluh.(none)2006-12-126-73/+113
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
| * | | | | | merging fixholyfoot/hf@mysql.com/deer.(none)2006-12-072-2/+2
| | | | | | |
| * | | | | | mergingholyfoot/hf@mysql.com/deer.(none)2006-12-073-18/+19
| | | | | | |
| * | | | | | Merge mysql.com:/home/hf/work/22372/my41-22372holyfoot/hf@mysql.com/deer.(none)2006-12-066-62/+101
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | into mysql.com:/home/hf/work/22372/my50-22372
| | * | | | | bug #22372holyfoot/hf@mysql.com/deer.(none)2006-12-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | datafile added to be used in gis.test
| | * | | | | bug #22372 (LOAD DATA crashes the table with the geometry field)holyfoot/hf@mysql.com/deer.(none)2006-12-065-55/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that the GEOMETRY NOT NULL can't automatically set any value as a default one. We always tried to complete LOAD DATA command even if there's not enough data in file. That doesn't work for GEOMETRY NOT NULL. Now Field_*::reset() returns an error sign and it's checked in mysql_load()
* | | | | | | Only call mysql_server_end if mysql_server_init has been called. msvensson@neptunus.(none)2006-12-061-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove DBUG_ENTER in my_end
* | | | | | | Flush stderr after print of error message to get predictable outputmsvensson@neptunus.(none)2006-12-061-0/+1
| | | | | | |
* | | | | | | Adjust replace to mask win pathsmsvensson@neptunus.(none)2006-12-061-2/+2
| | | | | | |
* | | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2006-12-0537-176/+682
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| * \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maintmsvensson@neptunus.(none)2006-12-050-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| | * | | | | | Remove hack that removes vardirmsvensson@neptunus.(none)2006-12-051-3/+0
| | | | | | | |
| | * | | | | | Merge bk-internal:/home/bk/mysql-4.1-buildmsvensson@neptunus.(none)2006-12-051-0/+3
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
| | | * | | | | re-enable multiple test runs in sequence for 4.1 on non-windowsdf@kahlann.erinye.com2006-12-051-0/+3
| | | | |/ / / | | | |/| | |
| * | | | | | Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061204181655|04883msvensson@neptunus.(none)2006-12-051-19/+0
| | | | | | |
| * | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-12-0536-157/+682
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| | * \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold/marty@mysql.com/linux.site2006-12-053-5/+16
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
| | * | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold/marty@mysql.com/linux.site2006-12-0436-157/+682
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
| | | * \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2006-12-011-0/+9
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
| | | | * | | | | | ndb - bug#24752jonas@perch.ndb.mysql.com2006-12-011-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevent any subsequent node restarts, but it's better than crashing an alive node
| | | * | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2006-12-0122-48/+279
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
| | | | * | | | | | ndb - bug#24748jonas@perch.ndb.mysql.com2006-12-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip rollback if only committedRead in transaction
| | | | * | | | | | ndb -jonas@perch.ndb.mysql.com2006-12-015-6/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add testcase for bug#24717 + fix typo
| | | | * | | | | | ndb - bug#24717jonas@perch.ndb.mysql.com2006-12-0110-19/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5.0 version Add some extra state to try to prevent sending committedread to node too early
| | | | * | | | | | ndb - bug#24503jonas@perch.ndb.mysql.com2006-11-221-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove debug printouts
| | | | * | | | | | ndb - bug#24503jonas@perch.ndb.mysql.com2006-11-225-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix scan filter on bit types (note should probably be enabled in condition pushdown aswell)
| | | | * | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workjonas@perch.ndb.mysql.com2006-11-221-8/+10
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/50-work
| | | | | * | | | | | ndb - bug#24461jonas@perch.ndb.mysql.com2006-11-221-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | m ove mlock to much earlier in startphases not to affect heartbeats
| | | | * | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workjonas@perch.ndb.mysql.com2006-11-221-4/+0
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/50-work
| | | | | * | | | | | ndb - bug#24461 - LockPagesInMemory ignoredjonas@perch.ndb.mysql.com2006-11-221-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | actually do run mlockall
| | | | * | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workjonas@perch.ndb.mysql.com2006-11-214-4/+86
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/50-work
| | | | | * | | | | | ndb -jonas@perch.ndb.mysql.com2006-11-211-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update error code list (for bug#24447)
| | | | | * | | | | | ndb - bug#24447jonas@perch.ndb.mysql.com2006-11-213-3/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | api disconnect just after SCAN_TABREQ
| | | * | | | | | | | Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bjgni/root@ts3-168.ts.cn.tlan2006-12-015-13/+39
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb
| | | | * \ \ \ \ \ \ \ Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bjlzhou/root@dev3-138.dev.cn.tlan2006-11-021-6/+8
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug19352
| | | | | * \ \ \ \ \ \ \ Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-4.1/bug19352lzhou/root@dev3-138.dev.cn.tlan2006-11-021-6/+8
| | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug19352
| | | | | | * | | | | | | | BUG#19352 return exact error message when parameters overflow in 32-bit ↵lzhou/root@dev3-138.dev.cn.tlan2006-11-011-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | platform.
| | | | * | | | | | | | | | Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bjlzhou/root@dev3-138.dev.cn.tlan2006-11-013-6/+12
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21052
| | | | | * | | | | | | | | BUG#21052 Modify the overflow error existed in last patch.lzhou/root@dev3-138.dev.cn.tlan2006-11-013-6/+12
| | | | | | | | | | | | | |
| | | | * | | | | | | | | | BUG #21858 Make sure retry when EINTR returns, which decreases memory leak ↵gni/root@dev3-127.(none)2006-10-081-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | chance.
| | | * | | | | | | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0mskold/marty@mysql.com/linux.site2006-11-302-9/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
| | | | * | | | | | | | | | | bug#18487 UPDATE IGNORE not supported for unique constraint violation of ↵mskold/marty@mysql.com/linux.site2006-11-302-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-primary key: only check pk if it is updated
| | | | * | | | | | | | | | | bug#18487 UPDATE IGNORE not supported for unique constraint violation of ↵mskold/marty@mysql.com/linux.site2006-11-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-primary key: handle INSERT ... ON DUPLICATE KEY UPDATE
View Lorry Controller Status