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

Automatic merge with 5.1

Browse Source
This commit is contained in:
Michael Widenius
2009-10-28 16:56:07 +02:00
parent d271502048 f3e3fe866b
commit 056cebe61a
58 changed files with 2456 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_parse.cc
View File

@@ -485,7 +485,11 @@ pthread_handler_t handle_bootstrap(void *arg)
break;
}
buff= (char*) thd->net.buff;
fgets(buff + length, thd->net.max_packet - length, file);
if (!fgets(buff + length, thd->net.max_packet - length, file))
{
bootstrap_error= 1;
break;
}
length+= (ulong) strlen(buff + length);
/* purecov: end */
}