diff options
| author | unknown <serg@serg.mylan> | 2004-07-20 15:34:57 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-07-20 15:34:57 +0200 |
| commit | e2d25910f8d5a5edacf3b64ad24f7e9dcd06123f (patch) | |
| tree | 25cbffcf973dd7f352a4bcdc885aa172cb20a57a /client | |
| parent | 3f5e1ba9ea87087836dcf311a174f4aae3d4cb5b (diff) | |
| parent | 26821ee3f584a79cfaf4339c0b5c45307be21986 (diff) | |
| download | mariadb-git-e2d25910f8d5a5edacf3b64ad24f7e9dcd06123f.tar.gz | |
manual merge
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
include/my_global.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/system_mysql_db.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 98bc7e750e1..c9ee6819a13 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1727,7 +1727,7 @@ com_help(String *buffer __attribute__((unused)), 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); + put_info("\nFor server side help, type 'help contents'\n", INFO_INFO); return 0; } |