database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/home/my/mysql-4.1
This commit is contained in:
monty@mysql.com
2004-05-19 05:09:41 +03:00
parent fdaf6d4221 21f1bca789
commit 332f124bc6
12 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/mysql.cc
View File

@@ -1239,7 +1239,6 @@ static void fix_history(String *final_command)
static int not_in_history(const char *line)
{
HIST_ENTRY *oldhist = history_get(history_length);
int num;
if (oldhist == 0)
return 1;
@@ -1589,7 +1588,6 @@ static int com_server_help(String *buffer __attribute__((unused)),
const char *server_cmd= buffer->ptr();
char cmd_buf[100];
MYSQL_RES *result;
MYSQL_FIELD *fields;
int error;
if (help_arg[0] != '\'')
@@ -1615,7 +1613,7 @@ static int com_server_help(String *buffer __attribute__((unused)),
{
unsigned int num_fields= mysql_num_fields(result);
my_ulonglong num_rows= mysql_num_rows(result);
fields= mysql_fetch_fields(result);
mysql_fetch_fields(result);
if (num_fields==3 && num_rows==1)
{
if (!(cur= mysql_fetch_row(result)))