summaryrefslogtreecommitdiff
path: root/storage/connect/ha_connect.h
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2014-02-07 22:44:43 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2014-02-07 22:44:43 +0100
commite1096934d7c9222691789d57c5c3754bcd3560dc (patch)
tree4da09acdfa95435d15d2600c88e9d19d6a09d31c /storage/connect/ha_connect.h
parent78f11e8ee23bb42d193429501038f6030fab38ed (diff)
downloadmariadb-git-e1096934d7c9222691789d57c5c3754bcd3560dc.tar.gz
- Check field option changes on ALTER TABLE in check_if_supported_inplace_alter.
If yes, the in-place algorithm cannot be used (inward tables) modified: storage/connect/ha_connect.cc storage/connect/ha_connect.h - add a test on ALTER TABLE added: storage/connect/mysql-test/connect/r/alter.result storage/connect/mysql-test/connect/t/alter.test
Diffstat (limited to 'storage/connect/ha_connect.h')
-rw-r--r--storage/connect/ha_connect.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/connect/ha_connect.h b/storage/connect/ha_connect.h
index 908c26fefdc..aae20db2f9d 100644
--- a/storage/connect/ha_connect.h
+++ b/storage/connect/ha_connect.h
@@ -173,11 +173,13 @@ public:
bool GetBooleanOption(char *opname, bool bdef);
bool SetBooleanOption(char *opname, bool b);
int GetIntegerOption(char *opname);
+ bool CheckString(const char *str1, const char *str2);
+ bool SameString(TABLE *tab, char *opn);
bool SetIntegerOption(char *opname, int n);
- bool SameChar(TABLE *tab, char *opn);
bool SameInt(TABLE *tab, char *opn);
bool SameBool(TABLE *tab, char *opn);
bool FileExists(const char *fn);
+ bool NoFieldOptionChange(TABLE *tab);
PFOS GetFieldOptionStruct(Field *fp);
void *GetColumnOption(PGLOBAL g, void *field, PCOLINFO pcf);
PIXDEF GetIndexInfo(TABLE_SHARE *s= NULL);