diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-07-18 14:52:29 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-07-18 14:52:29 +0500 |
| commit | 2dfdcae3989a12e513aee2ba2df86edfb27b0e7e (patch) | |
| tree | 942c3cb8d61303a6fe7a697ad2c646f07cb442b8 /sql-common | |
| parent | 8f5681c91915db689a4bbfa95346705cbb51f717 (diff) | |
| parent | d9992cc79eb8c51c2b967ec60137638583a8143d (diff) | |
| download | mariadb-git-2dfdcae3989a12e513aee2ba2df86edfb27b0e7e.tar.gz | |
Merge mysql.com:/home/hf/work/mysql-4.1.mrg
into mysql.com:/home/hf/work/mysql-5.0.mrg
libmysqld/embedded_priv.h:
Auto merged
sql-common/client.c:
Auto merged
include/mysql.h:
merging
libmysql/libmysql.c:
merging
libmysqld/lib_sql.cc:
merging
libmysqld/libmysqld.c:
merging
sql/sql_parse.cc:
merging
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 66d409cf1eb..45cd8befdf0 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -647,7 +647,8 @@ void free_rows(MYSQL_DATA *cur) my_bool cli_advanced_command(MYSQL *mysql, enum enum_server_command command, const char *header, ulong header_length, - const char *arg, ulong arg_length, my_bool skip_check) + const char *arg, ulong arg_length, my_bool skip_check, + MYSQL_STMT *stmt __attribute__((unused))) { NET *net= &mysql->net; my_bool result= 1; |