diff options
| author | unknown <jani@rhols221.adsl.netsonic.fi> | 2004-01-14 17:49:17 +0200 |
|---|---|---|
| committer | unknown <jani@rhols221.adsl.netsonic.fi> | 2004-01-14 17:49:17 +0200 |
| commit | 391cb07be00eef55f0c7811a871649f343d6de7a (patch) | |
| tree | 295d56ea069654105756939660bd71b86e2e2079 /client/mysql.cc | |
| parent | e9322b891adb41b78d907072776bdd365e6fd54c (diff) | |
| parent | 4d53f9961c54ae4e186050a0aa8272a216b7e877 (diff) | |
| download | mariadb-git-391cb07be00eef55f0c7811a871649f343d6de7a.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1
client/mysql.cc:
Auto merged
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 59872a83506..2cdcd23165e 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -174,9 +174,7 @@ static CHARSET_INFO *charset_info= &my_charset_latin1; #include "sslopt-vars.h" -#ifndef DBUG_OFF const char *default_dbug_option="d:t:o,/tmp/mysql.trace"; -#endif void tee_fprintf(FILE *file, const char *fmt, ...); void tee_fputs(const char *s, FILE *file); @@ -1558,7 +1556,7 @@ static int com_server_help(String *buffer __attribute__((unused)), init_pager(); char last_char; - int num_name, num_cat; + int num_name= 0, num_cat= 0; LINT_INIT(num_name); LINT_INIT(num_cat); |