database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main

Browse Source 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main


client/mysql.cc:
  Auto merged
myisam/mi_delete.c:
  Auto merged
mysql-test/r/fulltext2.result:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
sql/mysqld.cc:
  Auto merged
This commit is contained in:
unknown
2005-12-28 00:57:18 +11:00
parent 6759bbce9a c2ac089167
commit 88ef95ff4e
7 changed files with 144 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysql.cc
View File

@@ -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."},