summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix for bug #24558: Increasing decimal column length causes data lossunknown2007-03-153-0/+28
| | | | | | | | | | | | | | | | | | | Altering to a decimal field we get double value then store it that may cause data loss. Fix: use store_decimal() instead. mysql-test/r/type_newdecimal.result: Fix for bug #24558: Increasing decimal column length causes data loss - test result. mysql-test/t/type_newdecimal.test: Fix for bug #24558: Increasing decimal column length causes data loss - test case. sql/field_conv.cc: Fix for bug #24558: Increasing decimal column length causes data loss - if target field's result type is DECIMAL_RESULT use store_decimal(val_decimal()) in order not to loss data.
* Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-03-081-7/+20
|\ | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint mysql-test/mysql-test-run.pl: Manual merge
| * Bug #26792 Add DBX debugger support to mysql-test-run.plunknown2007-03-051-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | - Add --debugger=dbx - Fix --debugger=devenv, --debugger=DevEnv and --debugger=/path/devenv mysql-test/mysql-test-run.pl: Add support for --debugger=dbx to mysql-test-run.pl Fix case senitive match for vc, vcexpress or deven Make it possible to use full path to debugger for --debugger=/path/vcexpress
* | Merge bk-internal:/home/bk/mysql-5.0-maintunknown2007-03-08102-794/+3153
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint extra/comp_err.c: Auto merged sql/mysqld.cc: Auto merged
| * | comp_err.c: return ha_checksum from checksum_format_specifier() - more ↵unknown2007-03-081-2/+2
| | | | | | | | | | | | | | | | | | | | | correct, avoid a compiler warning extra/comp_err.c: return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning
| * | Merge bk-internal:/home/bk/mysql-5.0-ndbunknown2007-03-0813-31/+92
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-maint
| | * \ Merge poseidon.mysql.com:/home/tomas/mysql-5.0unknown2007-03-0813-31/+92
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
| | | * \ Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gcaunknown2007-03-071-1/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged
| | | | * | ndb -unknown2007-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix printout crashes testSystemRestart -n SR_UNDO ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: fix printout crashes testSystemRestart -n SR_UNDO
| | | * | | Merge poseidon.mysql.com:/home/tomas/mysql-5.0unknown2007-03-0212-30/+91
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb ndb/src/common/debugger/EventLogger.cpp: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged
| | | | * \ \ Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gcaunknown2007-03-028-5/+54
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
| | | | | * | Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other ↵unknown2007-03-027-5/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysqld nodes (part 1) - add signal data - add ref in dict on create/drop table/index
| | | | | * | Bug #26720 Infinite loop on unknown signal in logging functionunknown2007-03-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - terminate printing
| | | | * | | Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gcaunknown2007-03-012-20/+25
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
| | | | | * | ndb - rel5.1.16 NdbRecAttr print of blob length assumed uint64 aligned bufferunknown2007-03-012-20/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb - 5.1.16 uint64 align for ndb_restore (backport) ndb/src/ndbapi/NdbRecAttr.cpp: ndb - rel5.1.16 NdbRecAttr print of blob length assumed uint64 aligned buffer (backport) ndb/tools/restore/Restore.cpp: ndb - 5.1.16 uint64 align for ndb_restore (backport)
| | | | * | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2007-03-012-5/+12
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
| | | | | * \ \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2007-02-221-4/+7
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged
| | | | | | * | | ndb - bug#26481 - fix of bug fix 5.0 versionunknown2007-02-221-4/+7
| | | | | | | | |
| | | | | * | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2007-02-212-1/+5
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/src/common/debugger/EventLogger.cpp: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged
| | | | | | * | | ndb -unknown2007-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make StartREDO come up as default in cluster log ndb/src/common/debugger/EventLogger.cpp: Make StartREDO come up as default in cluster log
| | | | | | * | | ndb - bug#26515unknown2007-02-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make sure logPartPtr is correctly initialized ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: fix bug#26515 make sure logPartPtr is correctly initialized
| * | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-03-0816-460/+685
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
| | * \ \ \ \ \ \ \ Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41unknown2007-03-080-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
| | | * \ \ \ \ \ \ \ Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/40unknown2007-03-080-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41
| | | | * \ \ \ \ \ \ \ Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/40unknown2007-03-073-4/+128
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/40
| | | | * \ \ \ \ \ \ \ \ Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/40unknown2007-03-013-2/+4
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/40
| | | | * \ \ \ \ \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2007-02-142-1/+5
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/maint/40
| | | | * \ \ \ \ \ \ \ \ \ \ Merge siva.hindu.god:/home/tsmith/m/bk/40unknown2007-02-0810-152/+228
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/maint/40
| | | * | \ \ \ \ \ \ \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-buildunknown2007-03-083-9/+140
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-buildunknown2007-03-085-33/+160
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50 scripts/make_binary_distribution.sh: Auto merged
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-buildunknown2007-03-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
| | | | * | | | | | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-03-073-9/+140
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp/mysql-4.1-build
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-03-07100-700/+4257
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
| | | * | | | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-buildunknown2007-03-020-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
| | | | * | | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/tmp/mysql-4.0unknown2007-03-020-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp/mysql-4.1-build
| | | | | * | | | | | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2007-03-021-0/+10
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp/mysql-4.0
| | | * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-buildunknown2007-03-021-6/+25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M41/manpages-4.1unknown2007-03-021-0/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/manpages-5.0 support-files/mysql.spec.sh: Manual merge, adapting to expanded 5.0 filelist.
| | | | | * | | | | | | | | | | | | | | | Merge trift2.:/MySQL/M40/manpages-4.0unknown2007-03-021-0/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M41/manpages-4.1 support-files/mysql.spec.sh: SCCS merged
| | | | | | * | | | | | | | | | | | | | | Another man page in the RPMs.unknown2007-03-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support-files/mysql.spec.sh: Another man page.
| | | | | * | | | | | | | | | | | | | | | More man pages for the RPMs.unknown2007-03-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support-files/mysql.spec.sh: More man pages.
| | | | * | | | | | | | | | | | | | | | | Merge trift2.:/MySQL/M41/manpages-4.1unknown2007-03-020-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/manpages-5.0 support-files/mysql.spec.sh: Null-merge, the equivalent fix here is a change of its own.
| | | | | * | | | | | | | | | | | | | | | Merge trift2.:/MySQL/M40/manpages-4.0unknown2007-03-020-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M41/manpages-4.1 support-files/mysql.spec.sh: Null-merge, the equivalent fix here is a change of its own (NDB).
| | | | | | * | | | | | | | | | | | | | | Add missing man pages to the RPMs.unknown2007-03-021-0/+9
| | | | | | | |_|_|_|_|_|_|/ / / / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support-files/mysql.spec.sh: Add missing man pages.
| | | | | * | | | | | | | | | | | | | | Add the man pages for NDB to the RPMs.unknown2007-03-021-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support-files/mysql.spec.sh: Add the man pages for NDB.
| | | | * | | | | | | | | | | | | | | | Add the man pages for NDB to the RPMs.unknown2007-03-021-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support-files/mysql.spec.sh: Add the man pages for NDB.
| | | * | | | | | | | | | | | | | | | | mysql.sln:unknown2007-03-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correction of embedded build types VC++Files/mysql.sln: Correction of embedded build types
| | | * | | | | | | | | | | | | | | | | mysql.sln:unknown2007-03-011-22/+15
| | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabled build of all embedded server libraries, "libmysqld.ldd" "mysqldemb.lib" and "mysqlserver.lib" VC++Files/mysql.sln: Disabled build of all embedded server libraries, "libmysqld.ldd" "mysqldemb.lib" and "mysqlserver.lib"
| | | * | | | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-buildunknown2007-02-281-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp/mysql-5.0-build Docs/Makefile.am: Auto merged
| | | | * | | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/tmp/mysql-4.0unknown2007-02-281-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp/mysql-4.1-build