diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-07-23 16:18:20 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-07-23 16:18:20 +0400 |
| commit | b3a11e66a73f4cacc2f48bec8d51efa27bb4b07b (patch) | |
| tree | ec0d5e30711ea7f58dc204f0788587f6f770b140 /client/readline.cc | |
| parent | e875a1d66b83b758c34d2190ffd180bd626327ea (diff) | |
| parent | 74d67316829134f04bac656879408d4f7f2de8a4 (diff) | |
| download | mariadb-git-b3a11e66a73f4cacc2f48bec8d51efa27bb4b07b.tar.gz | |
Auto-merge from mysql-trunk-bugfixing.
Diffstat (limited to 'client/readline.cc')
| -rw-r--r-- | client/readline.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/readline.cc b/client/readline.cc index 73ce7c3b8c7..5c1a9951d9b 100644 --- a/client/readline.cc +++ b/client/readline.cc @@ -35,7 +35,7 @@ LINE_BUFFER *batch_readline_init(ulong max_size,FILE *file) return 0; if (init_line_buffer(line_buff,my_fileno(file),IO_SIZE,max_size)) { - my_free(line_buff,MYF(0)); + my_free(line_buff); return 0; } return line_buff; @@ -63,8 +63,8 @@ void batch_readline_end(LINE_BUFFER *line_buff) { if (line_buff) { - my_free(line_buff->buffer,MYF(MY_ALLOW_ZERO_PTR)); - my_free(line_buff,MYF(0)); + my_free(line_buff->buffer); + my_free(line_buff); } } @@ -77,7 +77,7 @@ LINE_BUFFER *batch_readline_command(LINE_BUFFER *line_buff, char * str) return 0; if (init_line_buffer_from_string(line_buff,str)) { - my_free(line_buff,MYF(0)); + my_free(line_buff); return 0; } return line_buff; |