diff options
| author | unknown <ingo@mysql.com> | 2005-09-23 17:27:07 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-09-23 17:27:07 +0200 |
| commit | 944db06bbb328288d5e9cfc85de86876895b8b62 (patch) | |
| tree | 48baa8a8836b9aa39f3616c84580cec8a057ba32 /myisam/myisamdef.h | |
| parent | 79b79064fafc92b5b5fcb5402ad7b2bace2cdb77 (diff) | |
| parent | 9c0d809270a1d74ec33711d94cd65930eab11579 (diff) | |
| download | mariadb-git-944db06bbb328288d5e9cfc85de86876895b8b62.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.1-4100
into mysql.com:/home/mydev/mysql-5.0-5000
myisam/mi_dbug.c:
Auto merged
myisam/mi_rkey.c:
Auto merged
myisam/mi_search.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
Diffstat (limited to 'myisam/myisamdef.h')
| -rw-r--r-- | myisam/myisamdef.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h index 82f7fd7360e..6b040f2ef0e 100644 --- a/myisam/myisamdef.h +++ b/myisam/myisamdef.h @@ -261,6 +261,7 @@ struct st_myisam_info { uint last_rkey_length; /* Last length in mi_rkey() */ enum ha_rkey_function last_key_func; /* CONTAIN, OVERLAP, etc */ uint save_lastkey_length; + uint pack_key_length; /* For MYISAMMRG */ int errkey; /* Got last error on this key */ int lock_type; /* How database was locked */ int tmp_lock_type; /* When locked by readinfo */ |