summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Doxygenization of comments.unknown2007-10-1125-2502/+2540
|
* Doxygenize comments, a*.cc - field.cc .unknown2007-10-094-316/+313
| | | | | | | | | | | sql/derror.cc: Doxygenize comments. sql/des_key_file.cc: Doxygenize comments. sql/discover.cc: Doxygenize comments. sql/field.cc: Doxygenize comments.
* Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2007-10-0814-23/+23
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint mysql-test/lib/mtr_report.pl: Auto merged mysql-test/mysql-test-run-shell.sh: Auto merged netware/mysql_test_run.c: Auto merged sql/mysqld.cc: Auto merged storage/ndb/include/ndbapi/Ndb.hpp: Auto merged scripts/mysqld_safe.sh: Manual merge.
| * Change URLs.unknown2007-10-0514-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our web server has been restructured several times, and references to it in our source code has stayed the same. This patch from Paul DuBois updates all URLs to modern semantics. debian/po/ca.po: Change URLs. debian/po/cs.po: Change URLs. debian/po/da.po: Change URLs. debian/po/gl.po: Change URLs. debian/po/ja.po: Change URLs. debian/po/pt_BR.po: Change URLs. debian/po/sv.po: Change URLs. debian/po/tr.po: Change URLs. mysql-test/lib/mtr_report.pl: Change URLs. mysql-test/mysql-test-run-shell.sh: Change URLs. ndb/include/ndbapi/Ndb.hpp: Change URLs. netware/mysql_test_run.c: Change URLs. scripts/mysqld_safe.sh: Change URLs. sql/mysqld.cc: Change URLs.
* | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-10-063-0/+20
|\ \ | | | | | | | | | | | | | | | | | | into sin.intern.azundris.com:/home/tnurnberg/31253/51-31253
| * | Bug #31253: crash comparing datetime to doubleunknown2007-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | after-merge fixies mysql-test/r/type_datetime.result: adjust to 5.1 warning message
| * | Merge sin.intern.azundris.com:/home/tnurnberg/31253/50-31253unknown2007-10-053-0/+20
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sin.intern.azundris.com:/home/tnurnberg/31253/51-31253 sql/item.cc: Auto merged mysql-test/r/type_datetime.result: SCCS merged mysql-test/t/type_datetime.test: SCCS merged
| | * | Bug #31253: crash comparing datetime to doubleunknown2007-10-053-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | convert(<invalid time>, datetime) in WHERE caused crash as function returned (void*)NULL, but did not flag SQL NULL. It does now. mysql-test/r/type_datetime.result: show that convert() to datetime in a WHERE-clause will no longer crash the server on invalid input. mysql-test/t/type_datetime.test: show that convert() to datetime in a WHERE-clause will no longer crash the server on invalid input. sql/item.cc: When failing to process time values, do not just return (void*)NULL, but flag SQL NULL as well so no caller will try to process the 0x0L. This makes behaviour for Item::Item::val_decimal_from_date() and Item::Item::val_decimal_from_time() identical.
* | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-10-065-10/+259
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sin.intern.azundris.com:/home/tnurnberg/19828/51-19828
| * \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-10-055-10/+259
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sin.intern.azundris.com:/home/tnurnberg/19828/51-19828 mysql-test/r/grant.result: Auto merged sql/sql_acl.cc: Auto merged
| | * \ \ \ Merge sin.intern.azundris.com:/home/tnurnberg/19828/50-19828unknown2007-10-055-10/+259
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sin.intern.azundris.com:/home/tnurnberg/19828/51-19828 mysql-test/t/grant.test: Auto merged sql/sql_acl.cc: Auto merged mysql-test/r/grant.result: manual merge
| | | * | | | Bug#19828: Case sensitivity in hostname leads to inconsistent behaviorunknown2007-09-205-10/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clean up SHOW GRANTS so it will show host-names with case as entered. make REVOKE and friends case-sensitive to make things more intuitive. Patch by Martin Friebe. mysql-test/r/grant.result: Bug#19828: Case sensitivity in hostname leads to inconsistent behavior clean up after test so random order of tests is possible mysql-test/r/grant3.result: Bug#19828: Case sensitivity in hostname leads to inconsistent behavior Show that REVOKE, SHOW GRANTS etc. are now consistently case-sensitive. mysql-test/t/grant.test: Bug#19828: Case sensitivity in hostname leads to inconsistent behavior clean up after test so random order of tests is possible mysql-test/t/grant3.test: Bug#19828: Case sensitivity in hostname leads to inconsistent behavior Show that REVOKE, SHOW GRANTS etc. are now consistently case-sensitive.
* | | | | | | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maintunknown2007-10-052-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint client/mysqldump.c: Auto merged extra/comp_err.c: Auto merged mysys/my_init.c: Auto merged
| * \ \ \ \ \ \ Merge pilot.mysql.com:/data/msvensson/mysql/bug27789/my50-bug27789unknown2007-10-051-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
| | * | | | | | | Fixed Bug #27789 "Wrong permissions of sql/share/language directories"unknown2007-10-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extra/comp_err.c: Override my_mkdir() umask setting. The default is 0700 which perfectly makes sense for the server but leads to Bug #27789 when applied to comp_err generated directories in the souce tree. Generated directories and the files within won't be accessible to other users, sometimes including root if on a non-local filesystem, making "sudo make install" fail.
| * | | | | | | | Merge msvensson2.mysql.internal:mysql/mysql-5.0-maintunknown2007-10-054-12/+53
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
| * | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-10-053-13/+51
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sin.intern.azundris.com:/home/tnurnberg/31227/50-31227
| * \ \ \ \ \ \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-10-0414-9/+115
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sin.intern.azundris.com:/home/tnurnberg/30444/50-30444
| | * \ \ \ \ \ \ \ \ Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-maintunknown2007-10-044-0/+34
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
| | | * \ \ \ \ \ \ \ \ Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731unknown2007-10-044-0/+34
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
| | * | \ \ \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-10-0410-9/+81
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/ram/work/b31070/b31070.5.0
| * | | | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-10-041-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sin.intern.azundris.com:/home/tnurnberg/30444/50-30444 client/mysqldump.c: Auto merged
| * | | | | | | | | | | | Merge pilot.mysql.com:/data/msvensson/mysql/bug31167/my50-bug31167unknown2007-10-03169-1324/+8800
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
| | * | | | | | | | | | | | Bug#27597 mysqld-debug brokenunknown2007-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - "on" -> "restore" to avoid warning in MSVC when compiling with debug mysys/my_init.c: Fix spelling error that cause MSVC to throw a warning when compiling with debug. Use "restore" instaed of "on" to turn runtime checks back on
* | | | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maintunknown2007-10-053-6/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/mysqltest.test: Auto merged mysql-test/lib/mtr_cases.pl: Mereg 5.0->5.1
| * | | | | | | | | | | | | Update test case to allow the .reject file to be in either var/log or r/unknown2007-10-051-0/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Bug#27753 enable mysql-test-run.pl to ignore tests based on wildcardunknown2007-10-052-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/lib/mtr_cases.pl: Allow --skip-test and --do-test to take a perl regex mysql-test/mysql-test-run.pl: Update usage for --skip-test and --do-test
| * | | | | | | | | | | | | Bug#30560 Valgrind option to mysql-test-run with spaces in cause strange errorunknown2007-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/mysql-test-run.pl: Just pass the $opt_valgrind_options to mtr_add_arg - it does a "push(@$args, sprintf($format, @fargs));" behind the scenes
* | | | | | | | | | | | | | Remove printoutunknown2007-10-051-2/+0
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Update for 5.1 format of dirname_partunknown2007-10-051-2/+2
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maintunknown2007-10-051-4/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint client/mysqltest.c: Auto merged
| * | | | | | | | | | | | | Bug#31398 problems with mysql-test-run, part2unknown2007-10-051-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Write .reject file to r/ if it's writable else use opt_logdir client/mysqltest.c: Write .reject file to r/ if it's writable else use opt_logdir
* | | | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maintunknown2007-10-051-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint mysql-test/mysql-test-run.pl: Merge 5.0-> 5.1
| * | | | | | | | | | | | | Bug#31398 problems with mysql-test-rununknown2007-10-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - "mysqld --verbose --help" need to be started in a writable directory mysql-test/mysql-test-run.pl: Create a tmpdir where mysqld can peform it's lowercase or uppercase test
* | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-maintunknown2007-10-051-60/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
| * | | | | | | | | | | | | Bug#31400 mysql-test-run inconvenience problems running a certain testunknown2007-10-051-60/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Allow test case names to be specied in various different ways mysql-test/lib/mtr_cases.pl: Allow test name to be specified in all sorts of ways: mysql-test-run alias mysql-test-run alias.test mysql-test-run main.alias mysql-test-run main.alias.test mysql-test-run t/alias mysql-test-run t/alias.test
* | | | | | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-10-053-13/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sin.intern.azundris.com:/home/tnurnberg/31227/51-31227
| * | | | | | | | | | | | | Merge sin.intern.azundris.com:/home/tnurnberg/31227/50-31227unknown2007-10-053-13/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sin.intern.azundris.com:/home/tnurnberg/31227/51-31227 mysql-test/r/type_decimal.result: Auto merged sql/my_decimal.cc: Auto merged
| | * | | | | | | | | | | Bug#31227: memory overrun with decimal (6,6) and zerofill and group_concatunknown2007-10-053-13/+51
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reserve the space for the leading 0 (before the decimal point) in DECIMAL(a,a) ZEROFILL. mysql-test/r/type_decimal.result: show that we allocate a large enough buffer for output of DECIMAL(a,a) [ZEROFILL]. mysql-test/t/type_decimal.test: show that we allocate a large enough buffer for output of DECIMAL(a,a) [ZEROFILL]. without patch for bug#31227, valgrind will complain here; so will a debug build. sql/my_decimal.cc: Reserve the space for the leading 0 (before the decimal point) in DECIMAL(a,a) ZEROFILL. Doxygenise preamble of my_decimal2string().
* | | | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-10-0414-9/+115
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sin.intern.azundris.com:/home/tnurnberg/30444/51-30444
| * \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maintunknown2007-10-044-0/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
| | * \ \ \ \ \ \ \ \ \ \ \ Merge polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731unknown2007-10-044-0/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into polly.(none):/home/kaa/src/maint/mysql-5.1-maint sql/set_var.cc: Auto merged
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731unknown2007-10-044-0/+34
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731 mysql-test/r/variables.result: Auto merged mysys/my_getopt.c: Auto merged sql/set_var.cc: Auto merged mysql-test/t/variables.test: Manual merge.
| | | | * | | | | | | | | | | Issue a warning if a user sets an option or a variable to a value that is ↵unknown2007-10-044-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | greater than a defined maximum for the option/variable. This is for bug #29446 "Specifying a myisam_sort_buffer > 4GB on 64 bit machines not possible". Support for myisam_sort_buffer_size > 4 GB on 64-bit Windows will be looked at later in 5.2. mysql-test/r/variables.result: Fixed the test. mysql-test/t/variables.test: Fixed the test. mysys/my_getopt.c: Print a warning to the error log if a user sets an option to a value greater than the option's maximum value. sql/set_var.cc: Issue an SQL warning if a user assignes a value greater than the variable's maximum value.
| * | | | | | | | | | | | | | Merge mysql.com:/home/ram/work/b31070/b31070.5.0unknown2007-10-0410-9/+81
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | / / / / | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/ram/work/b31070/b31070.5.1 strings/ctype-big5.c: Auto merged strings/ctype-euc_kr.c: Auto merged strings/ctype-gb2312.c: Auto merged strings/ctype-sjis.c: Auto merged
| | * | | | | | | | | | | | merging: results adjustedunknown2007-10-045-0/+10
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge mysql.com:/home/ram/work/b31070/b31070.4.1unknown2007-10-0410-9/+71
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/ram/work/b31070/b31070.5.0 mysql-test/r/ctype_big5.result: Auto merged mysql-test/r/ctype_gbk.result: Auto merged mysql-test/r/ctype_uca.result: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-euc_kr.c: Auto merged strings/ctype-gb2312.c: Auto merged strings/ctype-sjis.c: Auto merged BitKeeper/deleted/.del-ctype-cp932.c: Auto merged
| | | * | | | | | | | | | | Fix for bug #31069: crash in 'sounds like'unknown2007-10-0411-11/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and for bug #31070: crash during conversion of charsets Problem: passing a 0 byte length string to some my_mb_wc_XXX() functions leads to server crash due to improper argument check. Fix: properly check arguments passed to my_mb_wc_XXX() functions. mysql-test/include/ctype_common.inc: Fix for bug #31069: crash in 'sounds like' and bug #31070: crash during conversion of charsets - test case. mysql-test/r/ctype_big5.result: Fix for bug #31069: crash in 'sounds like' and bug #31070: crash during conversion of charsets - test result. mysql-test/r/ctype_euckr.result: Fix for bug #31069: crash in 'sounds like' and bug #31070: crash during conversion of charsets - test result. mysql-test/r/ctype_gb2312.result: Fix for bug #31069: crash in 'sounds like' and bug #31070: crash during conversion of charsets - test result. mysql-test/r/ctype_gbk.result: Fix for bug #31069: crash in 'sounds like' and bug #31070: crash during conversion of charsets - test result. mysql-test/r/ctype_uca.result: Fix for bug #31069: crash in 'sounds like' and bug #31070: crash during conversion of charsets - test result. strings/ctype-big5.c: Fix for bug #31069: crash in 'sounds like' and bug #31070: crash during conversion of charsets - check the string length before testing its first byte. strings/ctype-cp932.c: Fix for bug #31069: crash in 'sounds like' and bug #31070: crash during conversion of charsets - check the string length before testing its first byte. strings/ctype-euc_kr.c: Fix for bug #31069: crash in 'sounds like' and bug #31070: crash during conversion of charsets - check the string length before testing its first byte. strings/ctype-gb2312.c: Fix for bug #31069: crash in 'sounds like' and bug #31070: crash during conversion of charsets - check the string length before testing its first byte. strings/ctype-sjis.c: Fix for bug #31069: crash in 'sounds like' and bug #31070: crash during conversion of charsets - check the string length before testing its first byte.
* | | | | | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-10-041-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sin.intern.azundris.com:/home/tnurnberg/30444/51-30444 client/mysqldump.c: Auto merged
| * | | | | | | | | | | | | Merge sin.intern.azundris.com:/home/tnurnberg/30444/50-30444unknown2007-10-041-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sin.intern.azundris.com:/home/tnurnberg/30444/51-30444 client/mysqldump.c: Auto merged