diff options
| author | unknown <konstantin@mysql.com> | 2005-11-25 13:57:13 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-11-25 13:57:13 +0300 |
| commit | 61e454c0a9758a2c12fc8b949706d6f356a02041 (patch) | |
| tree | cee4e8f13e8c0b9e324e58db5a2e995b60fe5ea0 /include | |
| parent | 1be7a7afa58d241895e73a45292c4a111c98a74c (diff) | |
| parent | 2a1ae3a5e3cbc7bb076c91ba0f8b5e6242319b28 (diff) | |
| download | mariadb-git-61e454c0a9758a2c12fc8b949706d6f356a02041.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-root
into mysql.com:/opt/local/work/mysql-5.0-root
mysql-test/r/ndb_alter_table.result:
Auto merged
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/table.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viossl.c:
Auto merged
include/my_base.h:
Manual merge.
mysql-test/r/ps.result:
Manual merge.
mysql-test/r/select.result:
Manual merge.
mysql-test/t/ndb_alter_table.test:
Manual merge.
mysql-test/t/ndb_basic.test:
Manual merge.
mysql-test/t/ps.test:
Manual merge.
sql-common/client.c:
k
sql/ha_ndbcluster.cc:
Manual merge.
sql/item.cc:
Manual merge.
sql/sql_table.cc:
Manual merge.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h index ba3edfad0c8..f05d547027f 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -248,7 +248,7 @@ enum ha_base_keytype { #define HA_OPTION_CHECKSUM 32 #define HA_OPTION_DELAY_KEY_WRITE 64 #define HA_OPTION_NO_PACK_KEYS 128 /* Reserved for MySQL */ -#define HA_OPTION_CREATE_FROM_ENGINE 256 +#define HA_OPTION_CREATE_FROM_ENGINE 256 #define HA_OPTION_TEMP_COMPRESS_RECORD ((uint) 16384) /* set by isamchk */ #define HA_OPTION_READ_ONLY_DATA ((uint) 32768) /* Set by isamchk */ |