summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <monty@mishka.mysql.fi>2003-10-06 22:56:34 +0300
committerunknown <monty@mishka.mysql.fi>2003-10-06 22:56:34 +0300
commit0e93376e71bd719658bbf99e413d51d7ee349dee (patch)
tree42623f3710505740b5171a6d3e6cdcb4aa119084 /client
parentbd7470241b0883b5bacc0f741e828a13773e7eec (diff)
downloadmariadb-git-0e93376e71bd719658bbf99e413d51d7ee349dee.tar.gz
Move init_compiled_charsets to own file
Remove dependency of charsets (in my_init) to get smaller binaries when charsets are not used Simple code cleanup client/mysql.cc: Fixed indentation include/my_sys.h: Move init_compiled_charsets to own file include/mysql.h: Remove compiler warning libmysql/Makefile.shared: Move init_compiled_charsets to own file mysys/Makefile.am: Move init_compiled_charsets to own file mysys/charset.c: Move init_compiled_charsets to own file mysys/my_init.c: Remove dependency of charsets scripts/mysql_create_system_tables.sh: Remove run time warning scripts/mysql_fix_privilege_tables.sql: Add help tables sql/sql_insert.cc: Code cleanup
Diffstat (limited to 'client')
-rw-r--r--client/mysql.cc29
1 files changed, 13 insertions, 16 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 37c83411091..e63ee1d2d75 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1474,6 +1474,7 @@ static void print_help_item(MYSQL_ROW *cur, int num_name, int num_cat, char *las
tee_fprintf(PAGER, " %s\n", (*cur)[num_name]);
}
+
static int com_server_help(String *buffer __attribute__((unused)),
char *line __attribute__((unused)), char *help_arg)
{
@@ -1575,23 +1576,19 @@ com_help(String *buffer __attribute__((unused)),
char * help_arg= strchr(line,' ');
if (help_arg)
- {
return com_server_help(buffer,line,help_arg+1);
- }
- else
- {
- put_info("\nFor the complete MySQL Manual online visit:\n http://www.mysql.com/documentation\n", INFO_INFO);
- put_info("For info on technical support from MySQL developers visit:\n http://www.mysql.com/support\n", INFO_INFO);
- put_info("For info on MySQL books, utilities, consultants, etc. visit:\n http://www.mysql.com/portal\n", INFO_INFO);
- put_info("List of all MySQL commands:", INFO_INFO);
- if (!named_cmds)
- put_info("Note that all text commands must be first on line and end with ';'",INFO_INFO);
- for (i = 0; commands[i].name; i++)
- {
- if (commands[i].func)
- tee_fprintf(stdout, "%s\t(\\%c)\t%s\n", commands[i].name,
- commands[i].cmd_char, commands[i].doc);
- }
+
+ put_info("\nFor the complete MySQL Manual online visit:\n http://www.mysql.com/documentation\n", INFO_INFO);
+ put_info("For info on technical support from MySQL developers visit:\n http://www.mysql.com/support\n", INFO_INFO);
+ put_info("For info on MySQL books, utilities, consultants, etc. visit:\n http://www.mysql.com/portal\n", INFO_INFO);
+ put_info("List of all MySQL commands:", INFO_INFO);
+ if (!named_cmds)
+ put_info("Note that all text commands must be first on line and end with ';'",INFO_INFO);
+ for (i = 0; commands[i].name; i++)
+ {
+ if (commands[i].func)
+ tee_fprintf(stdout, "%s\t(\\%c)\t%s\n", commands[i].name,
+ commands[i].cmd_char, commands[i].doc);
}
if (connected && mysql_get_server_version(&mysql) >= 40100)
put_info("\nFor server side help, type 'help all'\n", INFO_INFO);