diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-07-11 11:57:49 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-07-11 11:57:49 +0300 |
| commit | 2ca32b764b97f1409dda5f648086075cab2559db (patch) | |
| tree | 59e8a2b8ae66e1621ebc91c449331732c2cb907f /include | |
| parent | 33e556ff5562212746011e1c1232d3dbd00f59a2 (diff) | |
| parent | 1abab6c7c7461bac95afd424e80b9a953fdf897b (diff) | |
| download | mariadb-git-2ca32b764b97f1409dda5f648086075cab2559db.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/B29325-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B29325-5.1-opt
include/my_base.h:
Auto merged
mysql-test/t/create.test:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/mi_create.c:
Auto merged
mysql-test/r/create.result:
5.0-opt -> 5.1-opt merge
sql/set_var.cc:
5.0-opt -> 5.1-opt merge
sql/sql_class.h:
5.0-opt -> 5.1-opt merge
sql/sql_table.cc:
5.0-opt -> 5.1-opt merge
sql/unireg.cc:
5.0-opt -> 5.1-opt merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_base.h b/include/my_base.h index bbc0c0f1f5c..04127b81b78 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -299,6 +299,7 @@ enum ha_base_keytype { #define HA_PACK_RECORD 2 /* Request packed record format */ #define HA_CREATE_TMP_TABLE 4 #define HA_CREATE_CHECKSUM 8 +#define HA_CREATE_KEEP_FILES 16 /* don't overwrite .MYD and MYI */ #define HA_CREATE_DELAY_KEY_WRITE 64 #define HA_CREATE_RELIES_ON_SQL_LAYER 128 |