diff options
| author | unknown <igor@rurik.mysql.com> | 2005-02-11 10:44:03 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-02-11 10:44:03 -0800 |
| commit | 7314690bb2b975768d76346faaad8030b5b4e3ca (patch) | |
| tree | 7c697149de84c1ac690efd7e622e12a88ab53d98 | |
| parent | 4b7e8a8e371c3df5446bc33ff9773cb397cd93fe (diff) | |
| parent | aa3727d7dc294e82b6e9ba81db0b86c56b804e5d (diff) | |
| download | mariadb-git-7314690bb2b975768d76346faaad8030b5b4e3ca.tar.gz | |
Manual merge
BitKeeper/triggers/post-commit:
Auto merged
sql/table.cc:
Auto merged
| -rwxr-xr-x | BitKeeper/triggers/post-commit | 1 | ||||
| -rw-r--r-- | sql/table.cc | 13 |
2 files changed, 6 insertions, 8 deletions
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit index 6290742f30e..184c6243ef8 100755 --- a/BitKeeper/triggers/post-commit +++ b/BitKeeper/triggers/post-commit @@ -62,7 +62,6 @@ From: $FROM To: $INTERNALS Subject: bk commit into $VERSION tree ($CHANGESET)$BS $BH - Below is the list of changes that have just been committed into a local $VERSION repository of $USER. When $USER does a push these changes will be propagated to the main repository and, within 24 hours after the diff --git a/sql/table.cc b/sql/table.cc index 1abe4af9711..064d7f1afc1 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -195,7 +195,6 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, goto err_not_open; /* purecov: inspected */ bzero((char*) keyinfo,n_length); outparam->key_info=keyinfo; - outparam->max_key_length= outparam->total_key_length= 0; key_part= my_reinterpret_cast(KEY_PART_INFO*) (keyinfo+keys); strpos=disk_buff+6; @@ -251,11 +250,6 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, } key_part->store_length=key_part->length; } - set_if_bigger(outparam->max_key_length,keyinfo->key_length+ - keyinfo->key_parts); - outparam->total_key_length+= keyinfo->key_length; - if (keyinfo->flags & HA_NOSAME) - set_if_bigger(outparam->max_unique_length,keyinfo->key_length); } keynames=(char*) key_part; strpos+= (strmov(keynames, (char *) strpos) - keynames)+1; @@ -627,7 +621,6 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, if (!(field->flags & BINARY_FLAG)) keyinfo->flags|= HA_END_SPACE_KEY; } - set_if_bigger(outparam->max_key_length, keyinfo->key_length); if (i == 0 && key != primary_key) field->flags |= ((keyinfo->flags & HA_NOSAME) && @@ -686,6 +679,12 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, } } keyinfo->usable_key_parts=usable_parts; // Filesort + + set_if_bigger(outparam->max_key_length,keyinfo->key_length+ + keyinfo->key_parts); + outparam->total_key_length+= keyinfo->key_length; + if (keyinfo->flags & HA_NOSAME) + set_if_bigger(outparam->max_unique_length,keyinfo->key_length); } if (primary_key < MAX_KEY && (outparam->keys_in_use.is_set(primary_key))) |