diff options
| author | unknown <hf@genie.(none)> | 2002-10-18 15:55:21 +0500 |
|---|---|---|
| committer | unknown <hf@genie.(none)> | 2002-10-18 15:55:21 +0500 |
| commit | a62ee2202f86c47f6a8d6d05948e181d73d56ba1 (patch) | |
| tree | e1ac6531db331ae24b2dcfca9ab05c0a35f3fc92 /sql/ha_myisam.cc | |
| parent | 4ae5fd0b892748925b3899131adc2c192453f693 (diff) | |
| parent | 4c4c31db7b34082901fb976371914f9d5e8c952f (diff) | |
| download | mariadb-git-a62ee2202f86c47f6a8d6d05948e181d73d56ba1.tar.gz | |
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/hf/work/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_pkg.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
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
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 */ |