diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-02-18 19:21:52 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-02-18 19:21:52 +0400 |
| commit | f41aadfaedeb90f5f9f9fb8100de81642cb5a048 (patch) | |
| tree | e08bf6f3a71b21f5011fed7f63b9f18a92e15c00 /storage/connect/reldef.cpp | |
| parent | 8e1c194904e028accd0b1fb9f3c4e70cf8077c4d (diff) | |
| download | mariadb-git-f41aadfaedeb90f5f9f9fb8100de81642cb5a048.tar.gz | |
Adding DATA_CHARSET table option.
Diffstat (limited to 'storage/connect/reldef.cpp')
| -rw-r--r-- | storage/connect/reldef.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/connect/reldef.cpp b/storage/connect/reldef.cpp index 17eecf269c4..ac596692dc0 100644 --- a/storage/connect/reldef.cpp +++ b/storage/connect/reldef.cpp @@ -102,6 +102,10 @@ bool TABDEF::Define(PGLOBAL g, PCATLG cat, LPCSTR name, LPCSTR am) Multiple = cat->GetIntCatInfo(name, "Multiple", 0); Degree = cat->GetIntCatInfo(name, "Degree", 0); Read_Only = cat->GetBoolCatInfo(name, "ReadOnly", false); + const char *data_charset_name= cat->GetStringCatInfo(g, Name, "Data_charset", NULL); + m_data_charset= data_charset_name ? + get_charset_by_csname(data_charset_name, MY_CS_PRIMARY, 0): + NULL; // Get The column definitions if ((poff = cat->GetColCatInfo(g, this)) < 0) |