summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequireunknown2007-05-282-5/+5
| | | | | | | - correction, backport to 5.0
* Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequireunknown2007-05-243-4/+10
| | | | | | | - correction, use recomputed _actual_ redobuffer
* Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0unknown2007-05-246-14/+38
|\ | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
| * Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-enginesunknown2007-05-230-0/+0
| |\ | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
| | * Merge mysql.com:/home/svoj/devel/bk/mysql-4.1unknown2007-05-236-11/+35
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
| * | \ Merge mysql.com:/home/svoj/devel/bk/mysql-5.0unknown2007-05-236-14/+38
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
| | * \ \ Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-enginesunknown2007-05-171-1/+1
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines mysys/my_seek.c: Auto merged
| | | * | Addition to fix forunknown2007-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG#25712 - insert delayed and check table run together report crashed tables Fixed wrongly applied patch.
| | * | | Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-enginesunknown2007-05-171-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines include/my_sys.h: Manual merge.
| | | * | Addition to fix forunknown2007-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG#25712 - insert delayed and check table run together report crashed tables Let MY_THREADSAFE have distinct value. Some functions call my_seek passing MyFlags argument directly to it. This may cause unnecessary locks, which may finally lead to a dead-lock (specifically see my_lock). include/my_sys.h: Addition to fix for BUG#25712 - insert delayed and check table run together report crashed tables Let MY_THREADSAFE have distinct value. Some functions call my_seek passing MyFlags argument directly to it. This may cause unnecessary locks, which may finally lead to a dead-lock (specifically see my_lock). Also it doesn't affect my_pread/my_pwrite in any way. So the comment was updated.
| | * | | Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-enginesunknown2007-05-172-10/+20
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines myisam/mi_check.c: Auto merged mysys/my_seek.c: Manual merge.
| | | * | BUG#25712 - insert delayed and check table run together report crashedunknown2007-05-162-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tables In case system doesn't have native pread/pwrite calls (e.g. Windows) and there is CHECK TABLE runs concurrently with another statement that reads from a table, the table may be reported as crashed. This is fixed by locking file descriptor when my_seek is executed on MyISAM index file and emulated pread/pwrite may be executed concurrently. Affects MyISAM tables on platforms that do not have native pread/pwrite calls (e.g. Windows). No deterministic test case for this bug. myisam/mi_check.c: Key file descriptor is shared among threads and mixed set of my_pread/my_pwrite and my_seek calls is possible. This is not a problem on systems that have native pread/pwrite calls. In case system doesn't have native pread/pwrite calls (e.g. Windows) we must ensure that my_pread/my_pwrite are not executed at the same time with my_seek. This is done by passing MY_THREADSAFE flag to my_seek. mysys/my_seek.c: On platforms that do not have native pread/pwrite calls (e.g. Windows) these calls are emulated as follow: lock fd, lseek, read, unlock fd. In case file descriptor is shared among threads, where one thread executes my_pread and another thread executes my_seek, we may read from a wrong position. This may happen because my_seek doesn't lock fd and thus may be executed by another thread after emulated pread has done lseek and before it has done read. To fix problem mentioned above we introduce new flag MY_THREADSAFE to my_seek, which is meaningful only in case pread/pwrite calls are emulated. If this flag is set, lseek operation is performed as follow: lock fd, seek, unlock fd.
| | * | | Merge mysql.com:/home/svoj/devel/mysql/BUG27998/mysql-4.1-enginesunknown2007-05-103-3/+17
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG27998/mysql-5.0-engines sql/ha_blackhole.h: Auto merged mysql-test/r/blackhole.result: Manual merge. mysql-test/t/blackhole.test: Manual merge.
| | | * | BUG#27998 - mysqld crashed when executing INSERT DELAYEDunknown2007-04-283-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on a BLACKHOLE table Using INSERT DELAYED on BLACKHOLE tables could lead to server crash. This happens because delayed thread wants to upgrade a lock, but BLACKHOLE tables do not have locks at all. This patch rejects attempts to use INSERT DELAYED on MERGE tables. mysql-test/r/blackhole.result: A test case for BUG#27998. mysql-test/t/blackhole.test: A test case for BUG#27998. sql/ha_blackhole.h: Removed HA_CAN_INSERT_DELAYED flag from table_flags(). The insert delayed thread upgrades the lock. Hence it is incapable to handle BLACKHOLE tables, which do not have locks at all.
* | | | | remove some not used codeunknown2007-05-231-20/+0
|/ / / /
* | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndbunknown2007-05-220-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
| * | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1unknown2007-05-226-34/+103
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
* | \ \ \ Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0unknown2007-05-2221-265/+274
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
| * \ \ \ \ Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndbunknown2007-05-210-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
| | * | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1unknown2007-05-216-34/+103
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
| | | * \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/41-workunknown2007-05-181-1/+1
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
| | | * \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/41-workunknown2007-05-181-16/+18
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
| | | * \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/41-workunknown2007-05-186-18/+85
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
| * | | \ \ \ \ \ \ Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0unknown2007-05-2189-766/+3436
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
| * \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2007-05-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged
| | * \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/41-workunknown2007-05-181-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/50-work ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged
| | | * | | | | | | | | ndb - bug#28443unknown2007-05-181-1/+1
| | | | |_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | review comment 2, atleast 1 signal need for test prg ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: review comment, atleast 1 signal need
| * | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2007-05-181-16/+18
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged
| | * | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workunknown2007-05-181-16/+18
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/50-work ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged
| | | * | | | | | | | ndb - bug#28443unknown2007-05-181-16/+18
| | | | |_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | review comment if some tcp-transporter has data, then do select with timeout 0 ndb/src/common/transporter/TransporterRegistry.cpp: review comment if some tcp-transporter has data, then do select with timeout 0
| * | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2007-05-186-19/+85
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/src/common/transporter/Packer.cpp: Auto merged ndb/src/common/transporter/TCP_Transporter.hpp: Auto merged ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged ndb/test/ndbapi/testNdbApi.cpp: merge ndb/test/run-test/daily-basic-tests.txt: merge
| | * | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workunknown2007-05-186-19/+85
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/50-work ndb/src/common/transporter/Packer.cpp: Auto merged ndb/src/common/transporter/TCP_Transporter.hpp: Auto merged ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged ndb/src/common/transporter/TransporterRegistry.cpp: merge ndb/test/ndbapi/testNdbApi.cpp: merge ndb/test/run-test/daily-basic-tests.txt: merge
| | | * | | | | | | ndb - bug#28443unknown2007-05-186-18/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that data can not e left lingering in receive buffer ndb/src/common/transporter/Packer.cpp: test, make MAX_RECEIVED_SIGNALS an variable ndb/src/common/transporter/TCP_Transporter.hpp: add new method for checking of data in receive buffer ndb/src/common/transporter/TransporterRegistry.cpp: Make sure that 1) poll_TCP return true if any transporter has data in receiveBuffer (previously only if socket had data) 2) performReceive executes signals if TCP transporter has data in receiveBuffer (previously only if data was recevied) ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: test, make MAX_RECEIVED_SIGNALS an variable ndb/test/ndbapi/testNdbApi.cpp: testcase ndb/test/run-test/daily-basic-tests.txt: testcase
| * | | | | | | | | add error code to ndb requireunknown2007-05-151-1/+2
| | | | | | | | | |
| * | | | | | | | | improve error message on corrup schema fileunknown2007-05-151-10/+21
| | | | | | | | | |
| * | | | | | | | | Bug #26386 ndbd wont start after changing schemaunknown2007-05-153-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backported error code from 5.1 split error check when reading schema file ndb/include/mgmapi/ndbd_exit_codes.h: backported error code from 5.1 ndb/src/kernel/blocks/dbdict/Dbdict.cpp: backported error code from 5.1 split error check when reading schema file ndb/src/kernel/error/ndbd_exit_codes.c: backported error code from 5.1
| * | | | | | | | | #26906 No message slogan foundunknown2007-05-153-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added errormessage and code for "declaring node dead"
| * | | | | | | | | files to check if log bin is turned onunknown2007-05-142-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/include/have_log_bin.inc: New BitKeeper file ``mysql-test/include/have_log_bin.inc'' mysql-test/r/have_log_bin.require: New BitKeeper file ``mysql-test/r/have_log_bin.require''
| * | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2007-05-141-23/+36
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
| | * | | | | | | | | Bug #28410 ndb: no retry sleep when getting autoincrementunknown2007-05-141-23/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add retry sleep to allow temprary error to go away
| * | | | | | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2007-05-141-9/+18
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dator3.(none):/home/mikael/mysql_clones/rt-5.0
| | * | | | | | | | | Bug#25818 No return of NDB share object in failures in open methodunknown2007-05-111-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make sure resources are release properly on error
| * | | | | | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2007-05-108-187/+73
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dator3.(none):/home/mikael/mysql_clones/rt-5.0
| | * \ \ \ \ \ \ \ \ \ Merge mikael@192.168.0.203:/home/mikael/mysql_clones/rt-5.0unknown2007-05-082-0/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.0-ndb
| | * | | | | | | | | | | New SCI Transporter Build scriptsunknown2007-05-073-0/+19
| | | | | | | | | | | | |
| | * | | | | | | | | | | Fix SCI Transporterunknown2007-05-075-187/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config/ac-macros/ha_ndbcluster.m4: Fix SCI Transporter build part libmysqld/Makefile.am: Fix SCI Transporter build part libmysqld/examples/Makefile.am: Fix SCI Transporter build part
* | | | | | | | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41unknown2007-05-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
| * | | | | | | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41unknown2007-05-216-0/+97
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
| * | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1-maintunknown2007-05-1813-9/+206
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50unknown2007-05-2130-52/+560
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 configure.in: Auto merged mysql-test/r/strict.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/t/type_datetime.test: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged