diff options
| author | unknown <hf@bison.(none)> | 2002-06-17 17:14:20 +0500 |
|---|---|---|
| committer | unknown <hf@bison.(none)> | 2002-06-17 17:14:20 +0500 |
| commit | 0bf296a02bfb82e8f71c63809f82b2b472fb276a (patch) | |
| tree | 2b5260bdbaeb45cf5cd339349eb23bd4a98199ca /sql/ha_myisam.cc | |
| parent | e19b23821a5f367969eb323ca8bd315f080405d0 (diff) | |
| parent | ea10430d9c77b973edc8ce18caa918e4db6676bf (diff) | |
| download | mariadb-git-0bf296a02bfb82e8f71c63809f82b2b472fb276a.tar.gz | |
Resolving of conflicts from pull
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
include/violite.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
libmysqld/lib_vio.c:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/net_pkg.cc:
Merging of pull conflicts
sql/sql_base.cc:
Merging of pull conflicts
sql/sql_class.h:
Merging of pull conflicts
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; |