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

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work

Browse Source 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work


BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/include/have_bug25714.inc:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
configure.in:
  null-merge
BitKeeper/deleted/.del-net_serv.cc:
  Auto merged
BitKeeper/deleted/.del-pack.c:
  Auto merged
BitKeeper/deleted/.del-password.c:
  Auto merged
BitKeeper/deleted/.del-sql_state.c:
  Auto merged
This commit is contained in:
unknown
2007-09-04 10:54:32 +02:00
parent 25928276ac 0ec2e69d7f
commit ce845ef740
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libmysql/libmysql.c
View File

@@ -4677,15 +4677,16 @@ int cli_read_binary_rows(MYSQL_STMT *stmt)
MYSQL_DATA *result= &stmt->result;
MYSQL_ROWS *cur, **prev_ptr= &result->data;
NET *net;
DBUG_ENTER("cli_read_binary_rows");
DBUG_ENTER("cli_read_binary_rows");
if (!mysql)
{
set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate);
return 1;
DBUG_RETURN(1);
}
DBUG_ENTER("cli_read_binary_rows");
net = &mysql->net;
mysql= mysql->last_used_con;