mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
This commit is contained in:
df@pippilotta.erinye.com 2007-09-04 10:49:54 +02:00
commit 59b504a5e3
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libmysql/libmysql.c
View file

@ -4682,10 +4682,12 @@ int cli_read_binary_rows(MYSQL_STMT *stmt)
NET *net; NET *net;
DBUG_ENTER("cli_read_binary_rows"); DBUG_ENTER("cli_read_binary_rows");
DBUG_ENTER("cli_read_binary_rows");
if (!mysql) if (!mysql)
{ {
set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate); set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate);
return 1; DBUG_RETURN(1);
} }
net = &mysql->net; net = &mysql->net;

2
mysql-test/include/have_bug25714.inc
View file

@ -3,5 +3,5 @@
# #
--require r/have_bug25714.require --require r/have_bug25714.require
disable_query_log; disable_query_log;
eval select LENGTH("MYSQL_BUG25714") > 0 as "have_bug25714_exe"; eval select LENGTH("$MYSQL_BUG25714") > 0 as "have_bug25714_exe";
enable_query_log; enable_query_log;