Commit e71f3f1f authored by unknown's avatar unknown
Browse files

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint 

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_bug20328


client/mysql.cc:
  Auto merged
mysql-test/r/bug20328.result:
  Merge rename: mysql-test/r/mysql_client.result -> mysql-test/r/bug20328.result
mysql-test/t/bug20328.test:
  Merge rename: mysql-test/t/mysql_client.test -> mysql-test/t/bug20328.test
parents 73f47590 b80bba31

client/mysql.cc

+14 −3
Original line number Diff line number Diff line
@@ -1725,6 +1725,13 @@ static int com_server_help(String *buffer __attribute__((unused)), 
  

  if (help_arg[0] != '\'')

  {

	char *end_arg= strend(help_arg);

	if(--end_arg)

	{

		while (my_isspace(charset_info,*end_arg))

          end_arg--;

		*++end_arg= '\0';

	}

	(void) strxnmov(cmd_buf, sizeof(cmd_buf), "help '", help_arg, "'", NullS);

    server_cmd= cmd_buf;

  }
@@ -1811,9 +1818,13 @@ com_help(String *buffer __attribute__((unused)), 
{

  reg1 int i, j;

  char * help_arg= strchr(line,' '), buff[32], *end;



  if (help_arg)

    return com_server_help(buffer,line,help_arg+1);

  {

    while (my_isspace(charset_info,*help_arg))

      help_arg++;

	if (*help_arg)	  

	  return com_server_help(buffer,line,help_arg);

  }



  put_info("\nFor information about MySQL products and services, visit:\n"

           "   http://www.mysql.com/\n"

mysql-test/r/bug20328.result

0 → 100644
+44 −0
Original line number Diff line number Diff line 
?         (\?) Synonym for `help'.

clear     (\c) Clear command.

connect   (\r) Reconnect to the server. Optional arguments are db and host.

delimiter (\d) Set query delimiter. 

edit      (\e) Edit command with $EDITOR.

ego       (\G) Send command to mysql server, display result vertically.

exit      (\q) Exit mysql. Same as quit.

go        (\g) Send command to mysql server.

help      (\h) Display this help.

nopager   (\n) Disable pager, print to stdout.

notee     (\t) Don't write into outfile.

pager     (\P) Set PAGER [to_pager]. Print the query results via PAGER.

print     (\p) Print current command.

prompt    (\R) Change your mysql prompt.

quit      (\q) Quit mysql.

rehash    (\#) Rebuild completion hash.

source    (\.) Execute an SQL script file. Takes a file name as an argument.

status    (\s) Get status information from the server.

system    (\!) Execute a system shell command.

tee       (\T) Set outfile [to_outfile]. Append everything into given outfile.

use       (\u) Use another database. Takes database name as argument.

charset_name(\C) Switch to another charset. Might be needed for processing binlog.

?         (\?) Synonym for `help'.

clear     (\c) Clear command.

connect   (\r) Reconnect to the server. Optional arguments are db and host.

delimiter (\d) Set query delimiter. 

edit      (\e) Edit command with $EDITOR.

ego       (\G) Send command to mysql server, display result vertically.

exit      (\q) Exit mysql. Same as quit.

go        (\g) Send command to mysql server.

help      (\h) Display this help.

nopager   (\n) Disable pager, print to stdout.

notee     (\t) Don't write into outfile.

pager     (\P) Set PAGER [to_pager]. Print the query results via PAGER.

print     (\p) Print current command.

prompt    (\R) Change your mysql prompt.

quit      (\q) Quit mysql.

rehash    (\#) Rebuild completion hash.

source    (\.) Execute an SQL script file. Takes a file name as an argument.

status    (\s) Get status information from the server.

system    (\!) Execute a system shell command.

tee       (\T) Set outfile [to_outfile]. Append everything into given outfile.

use       (\u) Use another database. Takes database name as argument.

charset_name(\C) Switch to another charset. Might be needed for processing binlog.

mysql-test/t/bug20328.test

0 → 100644
+9 −0
Original line number Diff line number Diff line 
# This test should work in embedded server after we fix mysqltest

-- source include/not_embedded.inc



#

# Bug #20328: mysql client interprets commands in comments

#

--exec echo 'help' | $MYSQL

--exec echo 'help ' | $MYSQL