Merge branch 'ob-10.0' into 10.0

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;