diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-12-11 19:19:21 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-12-11 19:19:21 +0100 |
| commit | 673cc065988c45fb42fa0b1a5a25ef90451f4e48 (patch) | |
| tree | 23f365efc01c6cb16815c1459e3dd81ae5d38e34 /storage | |
| parent | 32393e2253dfa884168b3267f4e03ca5a9b3e647 (diff) | |
| parent | 32879b95803f1606812009b6f865f7600042a1d8 (diff) | |
| download | mariadb-git-673cc065988c45fb42fa0b1a5a25ef90451f4e48.tar.gz | |
Merge branch 'ob-10.1' into 10.1
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/connect/ha_connect.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index 84a78f7dee1..457e494159e 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -169,7 +169,7 @@ #define JSONMAX 10 // JSON Default max grp size extern "C" { - char version[]= "Version 1.04.0005 November 20, 2015"; + char version[]= "Version 1.04.0005 December 11, 2015"; #if defined(__WIN__) char compver[]= "Version 1.04.0005 " __DATE__ " " __TIME__; char slash= '\\'; @@ -6762,7 +6762,7 @@ maria_declare_plugin(connect) 0x0104, /* version number (1.04) */ NULL, /* status variables */ connect_system_variables, /* system variables */ - "1.04.0003", /* string version */ + "1.04.0005", /* string version */ MariaDB_PLUGIN_MATURITY_BETA /* maturity */ } maria_declare_plugin_end; |