summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | Bug #28361 Buffer overflow in DECIMAL code on Windows holyfoot/hf@mysql.com/hfmain.(none)2007-05-215-96/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | result max length changed for the 'decimal' fields so test results have to be fixed
| * | | | | | | | | | Merge magare.gmz:/home/kgeorge/mysql/work/B22855-5.0-optgkodinov/kgeorge@magare.gmz2007-05-213-7/+110
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | / / / / / | | | |_|_|/ / / / / | | |/| | | | | | | into magare.gmz:/home/kgeorge/mysql/work/B22855-5.1-opt
| | * | | | | | | | Merge macbook:mysql/work/B22855-5.0-optgkodinov/kgeorge@magare.gmz2007-05-213-7/+110
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | into magare.gmz:/home/kgeorge/mysql/work/B22855-5.0-opt
| | | * | | | | | | Bug#22855:gkodinov/kgeorge@macbook.gmz2007-05-175-7/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conversion errors when constructing the condition for an IN predicates were treated as if the affected column contains NULL. If such a IN predicate is inside NOT we get wrong results. Corrected the handling of conversion errors in an IN predicate that is resolved by unique_subquery (through subselect_uniquesubquery_engine).
| * | | | | | | | | Merge mysql.com:/home/hf/work/28361/my50-28361holyfoot/hf@hfmain.(none)2007-05-203-3/+18
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/28361/my51-28361
| | * | | | | | | | bug #28361 Buffer overflow in DECIMAL code on Windowsholyfoot/hf@mysql.com/hfmain.(none)2007-05-203-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | my_decimal in some cases can contain more decimal digits than is officially supported (DECIMAL_MAX_PRECISION), so we need to prepare bigger buffer for the resulting string.
* | | | | | | | | | Raise version number after cloning 5.1.19-betajbruehe/mysqldev@mysql.com/production.mysql.com2007-05-241-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-buildjoerg@trift2.2007-05-241-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| * | | | | | | | | | Makefile.am : Add "embedded" tests to the "test-bt" target.joerg@trift2.2007-05-241-0/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-builddf@pippilotta.erinye.com2007-05-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
| * | | | | | | | | | Merge trift2.:/MySQL/M50/push-5.0joerg@trift2.2007-05-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
* | \ \ \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-builddf@pippilotta.erinye.com2007-05-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
| * | | | | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-workdf@pippilotta.erinye.com2007-05-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
| | * \ \ \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-builddf@pippilotta.erinye.com2007-05-240-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
| | | * \ \ \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-builddf@pippilotta.erinye.com2007-05-232-32/+42
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
| * | | \ \ \ \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0df@pippilotta.erinye.com2007-05-243-32/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
* | | | | | | | | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1df@pippilotta.erinye.com2007-05-242-32/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-builddf@pippilotta.erinye.com2007-05-234-14/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | / / / / / / / / / / | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
| | * | | | | | | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.42df@pippilotta.erinye.com2007-05-235-14/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
| | | * | | | | | | | | | | | import of fix for bug#28240df@pippilotta.erinye.com2007-05-144-14/+21
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge ↵df@pippilotta.erinye.com2007-05-142-0/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-28358 into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.42
| | | | * | | | | | | | | | | | bug#28358 libmysql.dll cannot be dynamically loaded on Windowsdf@pippilotta.erinye.com2007-05-141-0/+4
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge trift2.:/MySQL/M50/bug26609-5.0joerg@trift2.2007-05-222-32/+42
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / | | | |/| | | | | / / / / / / / | | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0
| * | | | | | | | | | | | | | Merge trift2.:/MySQL/M50/bug26609-5.0joerg@trift2.2007-05-222-32/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/bug26609-5.1
| | * | | | | | | | | | | | | Add the "row_lock" test suite to the (to be) release build test run.joerg@trift2.2007-05-221-0/+2
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | scripts/make_binary_distribution.sh :joerg@trift2.2007-05-221-32/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include all the additional test suites in the binary packages ("tar.gz"). This is the tar.gz part of the fixes for bug#26609; for RPMs it is already done.
* | | | | | | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-enginessvoj@june.mysql.com2007-05-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
| * | | | | | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-enginessvoj@june.mysql.com2007-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.1svoj@mysql.com/june.mysql.com2007-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.0svoj@mysql.com/june.mysql.com2007-05-236-14/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/svoj/devel/bk/mysql-5.1svoj@june.mysql.com2007-05-2326-546/+2343
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
| * | | | | | | | | | | | | | | | | | BUG#25659 - memory leak via "plugins" testsvoj@mysql.com/june.mysql.com2007-05-214-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added suppressions for dlopen to make plugin test pass. - Do not pass empty string to mysqld, since my_getopt is not capable to handle it. - Re-enabled trailing UNINSTALL PLUGIN statement of plugin.test. The memory leak described in the bug report happens in libdl, not in mysqld. On some valgrind installations this error is suppressed by default, no idea why it isn't suppressed on pb-valgrind. <observation> If library remains open after thread has finished, and is closed by another thread, we get memory leak. But in case library is opened and closed by the same thread no leak occurs. </observation>
| * | | | | | | | | | | | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-enginessvoj@june.mysql.com2007-05-211-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG28341/mysql-5.1-engines
| | * | | | | | | | | | | | | | | | | | BUG#25659 - memory leak via "plugins" testsvoj@mysql.com/june.mysql.com2007-05-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enabled plugin test to check if it still leaks memory.
| * | | | | | | | | | | | | | | | | | | Addition to fix forsvoj@mysql.com/june.mysql.com2007-05-212-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG#28341 - Security issue still in library loading Added required option files to rpl_udf test.
| * | | | | | | | | | | | | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-enginessvoj@june.mysql.com2007-05-215-28/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG28341/mysql-5.1-engines
| | * | | | | | | | | | | | | | | | | | BUG#28341 - Security issue still in library loadingsvoj@mysql.com/june.mysql.com2007-05-185-28/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UDF can be created from any library in any part of the server LD_LIBRARY_PATH. Allow to load udfs only from plugin_dir. On windows, refuse to open udf in case it's path contains a slash. No good test case for this bug because of imperfect error message that includes error code and error string when it fails to dlopen a library.
| * | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-enginessvoj@june.mysql.com2007-05-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.1-engines
| | * | | | | | | | | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-enginessvoj@mysql.com/june.mysql.com2007-05-171-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines
| | | * | | | | | | | | | | | | | | | Addition to fix forsvoj@mysql.com/june.mysql.com2007-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-5.0-enginessvoj@june.mysql.com2007-05-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.1-engines
| | * | | | | | | | | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-enginessvoj@mysql.com/june.mysql.com2007-05-171-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines
| | | * | | | | | | | | | | | | | | | Addition to fix forsvoj@mysql.com/june.mysql.com2007-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).
| * | | | | | | | | | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-enginessvoj@april.(none)2007-05-172-10/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.1-engines
| | * | | | | | | | | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-enginessvoj@mysql.com/april.(none)2007-05-172-10/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines
| | | * | | | | | | | | | | | | | | | BUG#25712 - insert delayed and check table run together report crashedsvoj@mysql.com/april.(none)2007-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.
| * | | | | | | | | | | | | | | | | | Bug#17332 - changing key_buffer_size on a running serveristruewing@chilla.local2007-05-141-26/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can crash under load Post-post-review fixes. Fixed a typo == -> = Optimized normal flush at end of statement (FLUSH_KEEP), but let other flush types be stringent. Added comments. Fixed debugging.
| * | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesistruewing@chilla.local2007-05-107-487/+2072
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.1-bug17332
| | * | | | | | | | | | | | | | | | | | Bug#17332 - changing key_buffer_size on a running serveristruewing@chilla.local2007-03-232-164/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can crash under load After review fixes
| | * | | | | | | | | | | | | | | | | | Merge chilla.local:/home/mydev/mysql-5.1-bug17332-oldistruewing@chilla.local2007-03-207-474/+2128
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.1-bug17332