diff options
| author | unknown <stewart@mysql.com> | 2005-12-28 13:55:59 +1100 |
|---|---|---|
| committer | unknown <stewart@mysql.com> | 2005-12-28 13:55:59 +1100 |
| commit | 94cbe6fd293eac2eed1bfd48a31a0498dcb11406 (patch) | |
| tree | 720547939e4403e5a08c0131165d304b2444ea79 /client | |
| parent | 581750330bf6c0777db9e7dfd71c0c5b99a27b28 (diff) | |
| parent | 6706115c0a6db47ea5e640f4f03ca775c3cfda04 (diff) | |
| download | mariadb-git-94cbe6fd293eac2eed1bfd48a31a0498dcb11406.tar.gz | |
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into mysql.com:/home/stewart/Documents/MySQL/5.1/new
client/mysqltest.c:
Auto merged
sql/item.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
storage/myisam/mi_create.c:
Auto merged
storage/myisam/mi_delete.c:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
strings/decimal.c:
Auto merged
configure.in:
remove 5.0 version increement
sql/ha_archive.cc:
merge
sql/handler.cc:
merge
sql/mysqld.cc:
merge
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 1323b70cbf8..98af6561966 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -259,7 +259,7 @@ static COMMANDS commands[] = { { "quit", 'q', com_quit, 0, "Quit mysql." }, { "rehash", '#', com_rehash, 0, "Rebuild completion hash." }, { "source", '.', com_source, 1, - "Execute a SQL script file. Takes a file name as an argument."}, + "Execute an SQL script file. Takes a file name as an argument."}, { "status", 's', com_status, 0, "Get status information from the server."}, #ifdef USE_POPEN { "system", '!', com_shell, 1, "Execute a system shell command."}, |