diff options
| author | unknown <jimw@mysql.com> | 2005-10-19 13:47:05 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-10-19 13:47:05 -0700 |
| commit | 3d53c870d379e86cdfe3498cde843258fad52bb5 (patch) | |
| tree | 29e3c2a30ecd5f46627b4a7cc9b9b1d97a73be7a /strings | |
| parent | f8bfae6b8765e1219403b6dba720d10b49f9a223 (diff) | |
| parent | c3ac502ab16db7118c4b1f2a70a300e6bd40af85 (diff) | |
| download | mariadb-git-3d53c870d379e86cdfe3498cde843258fad52bb5.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/my_manage.c:
Auto merged
mysql-test/mysql_test_run_new.c:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
mysql-test/r/variables.result:
Resolve conflicts
mysql-test/t/variables.test:
Resolve conflicts
sql/sql_acl.cc:
Resolve conflicts
strings/ctype-simple.c:
Resolve conflicts
strings/ctype-ucs2.c:
Resolve conflicts
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-simple.c | 2 | ||||
| -rw-r--r-- | strings/ctype-ucs2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c index f6ac740730b..d6f2f0e5fe5 100644 --- a/strings/ctype-simple.c +++ b/strings/ctype-simple.c @@ -904,7 +904,7 @@ int my_longlong10_to_str_8bit(CHARSET_INFO *cs __attribute__((unused)), while (long_val != 0) { long quo= long_val/10; - *--p = '0' + (char)(long_val - quo*10); + *--p = (char) ('0' + (long_val - quo*10)); long_val= quo; } diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index b0d882d3943..80a7bd84601 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -1063,7 +1063,7 @@ int my_ll10tostr_ucs2(CHARSET_INFO *cs __attribute__((unused)), while (long_val != 0) { long quo= long_val/10; - *--p = '0' + (char)(long_val - quo*10); + *--p = (char) ('0' + (long_val - quo*10)); long_val= quo; } |