diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-10-10 14:15:09 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-10-10 14:15:09 -0600 |
| commit | 1a6cf629fda0563d078a75718d9d2244cb182f5d (patch) | |
| tree | 0c7021abce949f66539e39f9be638cd713ae31b6 /mysys | |
| parent | 0f7697933f150a0fb6ec62017bdd71a4588402b8 (diff) | |
| parent | 930656d5709f128660f070dad17465449d784655 (diff) | |
| download | mariadb-git-1a6cf629fda0563d078a75718d9d2244cb182f5d.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
configure.in:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/Makefile.am:
Auto merged
scripts/mysql_system_tables_data.sql:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/sql_select.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_getopt.c | 16 | ||||
| -rw-r--r-- | mysys/my_init.c | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 3a5b130e067..5b5c0881314 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -19,6 +19,7 @@ #include <my_sys.h> #include <mysys_err.h> #include <my_getopt.h> +#include <errno.h> static void default_reporter(enum loglevel level, const char *format, ...); my_error_reporter my_getopt_error_reporter= &default_reporter; @@ -730,7 +731,15 @@ static longlong eval_num_suffix(char *argument, int *error, char *option_name) longlong num; *error= 0; + errno= 0; num= strtoll(argument, &endchar, 10); + if (errno == ERANGE) + { + my_getopt_error_reporter(ERROR_LEVEL, + "Incorrect integer value: '%s'", argument); + *error= 1; + return 0; + } if (*endchar == 'k' || *endchar == 'K') num*= 1024L; else if (*endchar == 'm' || *endchar == 'M') @@ -767,7 +776,14 @@ static longlong getopt_ll(char *arg, const struct my_option *optp, int *err) num= eval_num_suffix(arg, err, (char*) optp->name); if (num > 0 && (ulonglong) num > (ulonglong) optp->max_value && optp->max_value) /* if max value is not set -> no upper limit */ + { + char buf[22]; + my_getopt_error_reporter(WARNING_LEVEL, + "Truncated incorrect %s value: '%s'", + optp->name, llstr(num, buf)); + num= (ulonglong) optp->max_value; + } num= ((num - optp->sub_size) / block_size); num= (longlong) (num * block_size); return max(num, optp->min_value); diff --git a/mysys/my_init.c b/mysys/my_init.c index b2eefe97ee8..6d1b9ec04be 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -299,7 +299,7 @@ int handle_rtc_failure(int err_type, const char *file, int line, return 0; /* Error is handled */ } -#pragma runtime_checks("", on) +#pragma runtime_checks("", restore) #endif |