mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-28 11:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Manual merge from mysql-trunk.

Browse source 
Conflicts:
  - mysql-test/r/partition.result
  - mysql-test/r/variables_debug.result
  - mysql-test/t/partition.test
  - mysql-test/t/variables_debug.test
This commit is contained in:
Alexander Nozdrin 2010-05-20 16:35:28 +04:00
commit dabd4a1c55
149 changed files with 1359 additions and 1183 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/protocol.cc
View file

@ -210,7 +210,7 @@ net_send_ok(THD *thd,
NET *net= &thd->net;
uchar buff[MYSQL_ERRMSG_SIZE+10],*pos;
bool error= FALSE;
DBUG_ENTER("my_ok");
DBUG_ENTER("net_send_ok");
if (! net->vio) // hack for re-parsing queries
{