diff options
| author | unknown <pem@mysql.com> | 2004-02-13 17:39:00 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2004-02-13 17:39:00 +0100 |
| commit | 078919ad9e01f074c41d2d8311d3e738d299a5d8 (patch) | |
| tree | 8bfbeb69721f881bfc6f0a93e5cb203b9810629f /sql-common | |
| parent | b5c8de4c835b493f28acfaca681e982046b8d818 (diff) | |
| parent | 9a3a0d7d4062982d0977b9268fd599d7b0745c2d (diff) | |
| download | mariadb-git-078919ad9e01f074c41d2d8311d3e738d299a5d8.tar.gz | |
Merge mysql.com:/home/pem/work/mysql-4.1
into mysql.com:/home/pem/work/mysql-5.0-merge
client/mysql.cc:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
tests/client_test.c:
Auto merged
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 3902e9b3e1d..af64bb2b210 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1420,7 +1420,8 @@ static MYSQL_METHODS client_methods= cli_read_binary_rows, cli_unbuffered_fetch, NULL, - cli_read_statistic + cli_read_statistic, + cli_read_query_result #endif }; |