diff options
| author | unknown <guilhem@mysql.com> | 2004-06-18 23:51:15 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-06-18 23:51:15 +0200 |
| commit | 227f223d6bbcab16c29b020315b79cf7143e669b (patch) | |
| tree | bdccc7bcabb922c886c76bf1c18f1dea22f06500 /libmysql | |
| parent | 94f36589c72c7c916802e2c8da9cb2f3ecc72b4a (diff) | |
| parent | 83f485968f643cc87573d57be6944ff32b18d79a (diff) | |
| download | mariadb-git-227f223d6bbcab16c29b020315b79cf7143e669b.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index ebbcbc5037d..6ad4e020464 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1284,10 +1284,12 @@ mysql_drop_db(MYSQL *mysql, const char *db) int STDCALL -mysql_shutdown(MYSQL *mysql) +mysql_shutdown(MYSQL *mysql, enum enum_shutdown_level shutdown_level) { + uchar level[1]; + level[0]= (uchar) shutdown_level; DBUG_ENTER("mysql_shutdown"); - DBUG_RETURN(simple_command(mysql,COM_SHUTDOWN,0,0,0)); + DBUG_RETURN(simple_command(mysql, COM_SHUTDOWN, (char *)level, 1, 0)); } |