diff options
| author | unknown <holyfoot@mysql.com> | 2006-01-19 18:05:57 +0400 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2006-01-19 18:05:57 +0400 |
| commit | d07932a3f19aa5bbaf50ea40aca9ad5cce5abb54 (patch) | |
| tree | 0c5df31a98305c1cfd75da28b7efa727365ffeef /sql-common | |
| parent | 098af0ae1aae693829f0c9daef551f2c3571c476 (diff) | |
| parent | 6731dd6380e19cc589cab89bd941fc36210c28ac (diff) | |
| download | mariadb-git-d07932a3f19aa5bbaf50ea40aca9ad5cce5abb54.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb
mysql-test/r/sp.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/mysql_client_test.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 4c2debd41ff..8e55cf7c2b7 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1545,7 +1545,8 @@ static MYSQL_METHODS client_methods= NULL, cli_read_statistics, cli_read_query_result, - cli_read_change_user_result + cli_read_change_user_result, + cli_read_binary_rows #endif }; @@ -2339,8 +2340,9 @@ static void mysql_close_free(MYSQL *mysql) my_free(mysql->user,MYF(MY_ALLOW_ZERO_PTR)); my_free(mysql->passwd,MYF(MY_ALLOW_ZERO_PTR)); my_free(mysql->db,MYF(MY_ALLOW_ZERO_PTR)); + my_free(mysql->info_buffer,MYF(MY_ALLOW_ZERO_PTR)); /* Clear pointers for better safety */ - mysql->host_info=mysql->user=mysql->passwd=mysql->db=0; + mysql->info_buffer=mysql->host_info=mysql->user=mysql->passwd=mysql->db=0; } @@ -2476,8 +2478,7 @@ get_info: if (!(mysql->server_status & SERVER_STATUS_AUTOCOMMIT)) mysql->server_status|= SERVER_STATUS_IN_TRANS; - if (!(fields=(*mysql->methods->read_rows)(mysql,(MYSQL_FIELD*)0, - protocol_41(mysql) ? 7 : 5))) + if (!(fields=cli_read_rows(mysql,(MYSQL_FIELD*)0, protocol_41(mysql) ? 7:5))) DBUG_RETURN(1); if (!(mysql->fields=unpack_fields(fields,&mysql->field_alloc, (uint) field_count,0, |