1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

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

into narttu.mysql.fi:/my/mysql-4.1


client/mysql.cc:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
This commit is contained in:
unknown
2003-06-14 11:38:09 +03:00
21 changed files with 638 additions and 693 deletions

View File

@@ -1525,6 +1525,9 @@ static int com_server_help(String *buffer __attribute__((unused)),
char last_char;
int num_name, num_cat;
LINT_INIT(num_name);
LINT_INIT(num_cat);
if (num_fields == 2)
{
put_info("Many help items for your request exist", INFO_INFO);
@@ -1841,7 +1844,7 @@ print_table_data(MYSQL_RES *result)
separator.fill(separator.length()+length+2,'-');
separator.append('+');
}
tee_puts(separator.c_ptr(), PAGER);
tee_puts(separator.c_ptr_safe(), PAGER);
if (column_names)
{
mysql_field_seek(result,0);