summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <holyfoot@deer.(none)>2006-02-17 10:52:32 +0400
committerunknown <holyfoot@deer.(none)>2006-02-17 10:52:32 +0400
commitbf840404581d81fbb351f976a08a124d9be0b624 (patch)
treee1075b7c3e3c1d0a91edf078cf69906180661d4c /include
parent74f6299efd3091e64f8eaf1c4b5ec979ed97ce03 (diff)
downloadmariadb-git-bf840404581d81fbb351f976a08a124d9be0b624.tar.gz
WL#2645 (CHECK TABLE FOR UPGRADE)
necessary implementation in the server mysql_upgrade script added client/mysqlcheck.c: --check-upgrade option added include/my_base.h: errcode added include/myisam.h: option added scripts/Makefile.am: mysql_upgrade script added sql/handler.cc: checks for old types/bugs added sql/handler.h: declarations regarding checks for upgrade sql/lex.h: sym added sql/share/errmsg.txt: error message added sql/slave.cc: now ha_repair is for public use sql/sql_table.cc: upgrade in ha_repair implemented sql/sql_yacc.yy: CHECK ... FOR UPGRADE added to syntax
Diffstat (limited to 'include')
-rw-r--r--include/my_base.h3
-rw-r--r--include/myisam.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h
index 77cd60fda92..c82ecd06627 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -346,8 +346,9 @@ enum ha_base_keytype {
#define HA_ERR_NO_CONNECTION 157 /* Could not connect to storage engine */
#define HA_ERR_NULL_IN_SPATIAL 158 /* NULLs are not supported in spatial index */
#define HA_ERR_TABLE_DEF_CHANGED 159 /* The table changed in storage engine */
+#define HA_ERR_TABLE_NEEDS_UPGRADE 160 /* The table changed in storage engine */
-#define HA_ERR_LAST 159 /*Copy last error nr.*/
+#define HA_ERR_LAST 160 /*Copy last error nr.*/
/* Add error numbers before HA_ERR_LAST and change it accordingly. */
#define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1)
diff --git a/include/myisam.h b/include/myisam.h
index 96c1e7e192e..321952dcf4c 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -368,6 +368,7 @@ extern uint mi_get_pointer_length(ulonglong file_length, uint def);
*/
#define TT_USEFRM 1
+#define TT_FOR_UPGRADE 2
#define O_NEW_INDEX 1 /* Bits set in out_flag */
#define O_NEW_DATA 2