diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-24 21:31:06 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-24 21:31:06 +0300 |
| commit | a82671178919afba86ddfdf2b64321eb9afff8e5 (patch) | |
| tree | dd5c0968aa7683d035c2570c2b708cf7ea8b37d6 /client | |
| parent | 918b25ec7ef208ece958d858cf03eb36033be2b7 (diff) | |
| parent | 31f66e55a8d24f7490cb17b9d12397c104b8bdee (diff) | |
| download | mariadb-git-a82671178919afba86ddfdf2b64321eb9afff8e5.tar.gz | |
Automatic merge
Fixed compiler warning
client/mysql.cc:
Fixed compiler warning
include/my_global.h:
Fixed typo
storage/maria/ha_maria.cc:
Merge
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 39ca04ccbb9..feb2a19e4f2 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1883,7 +1883,7 @@ static int read_and_execute(bool interactive) String buffer; #endif - char *line; + char *line= 0; char in_string=0; ulong line_number=0; bool ml_comment= 0; |