diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-03-09 21:19:57 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-03-09 21:19:57 +0100 |
| commit | 07df51aa758846562065197d335d39de84fe53cb (patch) | |
| tree | ca194dfa7eeeca6b2317648d8f054e024ba9f30f /client/readline.cc | |
| parent | 5dca460b002430c90cc877d07bd50b0538559392 (diff) | |
| parent | d1b3c64b230e35dccf33ac7bb70bdd52f779536b (diff) | |
| download | mariadb-git-07df51aa758846562065197d335d39de84fe53cb.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'client/readline.cc')
| -rw-r--r-- | client/readline.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/readline.cc b/client/readline.cc index 52ecb4e5c68..3d524633d69 100644 --- a/client/readline.cc +++ b/client/readline.cc @@ -108,7 +108,7 @@ init_line_buffer(LINE_BUFFER *buffer,File file,ulong size,ulong max_buffer) */ static bool init_line_buffer_from_string(LINE_BUFFER *buffer,my_string str) { - uint old_length=buffer->end - buffer->buffer; + uint old_length=(uint)(buffer->end - buffer->buffer); uint length= (uint) strlen(str); if (!(buffer->buffer= buffer->start_of_line= buffer->end_of_line= (char*)my_realloc(buffer->buffer, old_length+length+2, |