1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  mysql.com:/home/my/mysql-5.1


sql/handler.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
This commit is contained in:
unknown
2006-02-26 15:12:56 +02:00
58 changed files with 10793 additions and 113 deletions

View File

@@ -993,6 +993,7 @@ bool select_send::send_data(List<Item> &items)
protocol->remove_last_row();
else
DBUG_RETURN(protocol->write());
protocol->remove_last_row();
DBUG_RETURN(1);
}