mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
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
This commit is contained in:
@ -174,9 +174,7 @@ static CHARSET_INFO *charset_info= &my_charset_latin1;
|
|||||||
|
|
||||||
#include "sslopt-vars.h"
|
#include "sslopt-vars.h"
|
||||||
|
|
||||||
#ifndef DBUG_OFF
|
|
||||||
const char *default_dbug_option="d:t:o,/tmp/mysql.trace";
|
const char *default_dbug_option="d:t:o,/tmp/mysql.trace";
|
||||||
#endif
|
|
||||||
|
|
||||||
void tee_fprintf(FILE *file, const char *fmt, ...);
|
void tee_fprintf(FILE *file, const char *fmt, ...);
|
||||||
void tee_fputs(const char *s, FILE *file);
|
void tee_fputs(const char *s, FILE *file);
|
||||||
@ -1558,7 +1556,7 @@ static int com_server_help(String *buffer __attribute__((unused)),
|
|||||||
init_pager();
|
init_pager();
|
||||||
char last_char;
|
char last_char;
|
||||||
|
|
||||||
int num_name, num_cat;
|
int num_name= 0, num_cat= 0;
|
||||||
LINT_INIT(num_name);
|
LINT_INIT(num_name);
|
||||||
LINT_INIT(num_cat);
|
LINT_INIT(num_cat);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user