diff options
| author | hf@bison.(none) <> | 2002-06-17 17:14:20 +0500 |
|---|---|---|
| committer | hf@bison.(none) <> | 2002-06-17 17:14:20 +0500 |
| commit | cc6407f1a51dd5cadae81639a5a40bb689ccc6af (patch) | |
| tree | 2b5260bdbaeb45cf5cd339349eb23bd4a98199ca /sql/ha_myisam.cc | |
| parent | 67c06bf63aafa94cadf8ea71f157460f09d4475a (diff) | |
| parent | 9ba0b3bc21c879148294bac0421e8bf61e57dc16 (diff) | |
| download | mariadb-git-cc6407f1a51dd5cadae81639a5a40bb689ccc6af.tar.gz | |
Resolving of conflicts from pull
Diffstat (limited to 'sql/ha_myisam.cc')
| -rw-r--r-- | sql/ha_myisam.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index e32656b44d3..6a78a19c0a3 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -80,7 +80,7 @@ static void mi_check_print_msg(MI_CHECK *param, const char* msg_type, net_store_data(packet, msg_type); net_store_data(packet, msgbuf); - if (my_net_write(&thd->net, (char*)thd->packet.ptr(), thd->packet.length())) + if (SEND_ROW(thd, &thd->net, 4, (char*)thd->packet.ptr(), thd->packet.length())) sql_print_error("Failed on my_net_write, writing to stderr instead: %s\n", msgbuf); return; |