diff options
| author | guilhem@mysql.com <> | 2003-12-19 23:05:07 +0100 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2003-12-19 23:05:07 +0100 |
| commit | 1333f636ae47fe4c88b38e9bfdf582336228112e (patch) | |
| tree | 50edba9e847c863859ce7be00e6bbda0b26f939b /sql/ha_innodb.cc | |
| parent | df3b1a54f4cc62411b73ea8e146b9527147918db (diff) | |
| parent | 29e1bddb4337481ae2fbdfb6558060f85841eacb (diff) | |
| download | mariadb-git-1333f636ae47fe4c88b38e9bfdf582336228112e.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-new-binlog-format
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 6bf746c73e6..1ae13b0e462 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -33,11 +33,9 @@ InnoDB */ #include "mysql_priv.h" #include "slave.h" -#include "sql_cache.h" #ifdef HAVE_INNOBASE_DB #include <m_ctype.h> -#include <assert.h> #include <hash.h> #include <myisampack.h> @@ -1869,7 +1867,7 @@ ha_innobase::store_key_val_for_row( || mysql_type == FIELD_TYPE_BLOB || mysql_type == FIELD_TYPE_LONG_BLOB) { - ut_a(key_part->key_part_flag & HA_PART_KEY); + ut_a(key_part->key_part_flag & HA_PART_KEY_SEG); if (is_null) { buff += key_part->length + 2; @@ -3354,7 +3352,7 @@ create_index( for (i = 0; i < n_fields; i++) { key_part = key->key_part + i; - /* (The flag HA_PART_KEY denotes in MySQL a column prefix + /* (The flag HA_PART_KEY_SEG denotes in MySQL a column prefix field in an index: we only store a specified number of first bytes of the column to the index field.) The flag does not seem to be properly set by MySQL. Let us fall back on testing |