diff options
author | hf@genie.(none) <> | 2002-10-18 15:55:21 +0500 |
---|---|---|
committer | hf@genie.(none) <> | 2002-10-18 15:55:21 +0500 |
commit | 8a88791fb1a6c01742c8558369a8e1822da0b30c (patch) | |
tree | e1ac6531db331ae24b2dcfca9ab05c0a35f3fc92 /sql/ha_myisam.cc | |
parent | f3d3d2882d0e0b588bb4eac1f596306a3a1fdd6a (diff) | |
parent | 2be6f2721929bcb69324193a214a2954645eed64 (diff) | |
download | mariadb-git-8a88791fb1a6c01742c8558369a8e1822da0b30c.tar.gz |
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/hf/work/mysql-4.1
Diffstat (limited to 'sql/ha_myisam.cc')
-rw-r--r-- | sql/ha_myisam.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index e02252e711f..43a351101b3 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -79,7 +79,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; @@ -1093,7 +1093,7 @@ int ha_myisam::create(const char *name, register TABLE *table, keydef[i].flag|=HA_AUTO_KEY; found_auto_increment=1; } - if (field->type() == FIELD_TYPE_BLOB) + if ((field->type() == FIELD_TYPE_BLOB) || (field->type() == FIELD_TYPE_GEOMETRY)) { keydef[i].seg[j].flag|=HA_BLOB_PART; /* save number of bytes used to pack length */ |