diff options
| author | Michael Widenius <monty@mysql.com> | 2009-04-25 13:05:32 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2009-04-25 13:05:32 +0300 |
| commit | 2fe328a5666bb5b51e230a5ed78d95bd051b7b00 (patch) | |
| tree | e644a6134bfe892512501c648c938a2e93f08130 /sql/sql_string.cc | |
| parent | d364b563a624aa320c13a291a6d135251e6b910d (diff) | |
| parent | 12e300ad20774c3d1764262b023b3de480a697a6 (diff) | |
| download | mariadb-git-2fe328a5666bb5b51e230a5ed78d95bd051b7b00.tar.gz | |
Merged with mysql-5.1 tree.
client/mysqltest.cc:
Manually merged
configure.in:
Manually merged
mysql-test/r/variables.result:
Manually merged
mysql-test/t/variables.test:
Manually merged
mysys/my_pread.c:
Manually merged
mysys/my_read.c:
Manually merged
sql/mysqld.cc:
Manually merged
storage/csv/ha_tina.h:
Manually merged
storage/myisam/ha_myisam.cc:
Manually merged
storage/myisam/mi_check.c:
Manually merged
storage/myisam/mi_search.c:
Manually merged
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index f2c5b2750ef..f0324da328f 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -455,7 +455,7 @@ bool String::append(const char *s,uint32 arg_length) bool String::append(const char *s) { - return append(s, strlen(s)); + return append(s, (uint) strlen(s)); } @@ -1048,7 +1048,7 @@ outp: } } *from_end_pos= from; - res= to - to_start; + res= (uint) (to - to_start); } return (uint32) res; } |