mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
Merge branch 'ob-10.1' into 10.1
This commit is contained in:
commit
673cc06598
1 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue