Merge branch 'merge/merge-xtradb-5.5' into 5.5
This commit is contained in:
commit
51c415d97d
@ -64,10 +64,10 @@ component, i.e. we show M.N.P as M.N */
|
||||
(INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
|
||||
|
||||
#ifndef PERCONA_INNODB_VERSION
|
||||
#define PERCONA_INNODB_VERSION 38.10
|
||||
#define PERCONA_INNODB_VERSION 38.11
|
||||
#endif
|
||||
|
||||
#define INNODB_VERSION_STR "5.5.58-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION)
|
||||
#define INNODB_VERSION_STR "5.5.59-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION)
|
||||
|
||||
#define REFMAN "http://dev.mysql.com/doc/refman/" \
|
||||
IB_TO_STR(MYSQL_MAJOR_VERSION) "." \
|
||||
|
@ -1,6 +1,6 @@
|
||||
/*****************************************************************************
|
||||
|
||||
Copyright (c) 1996, 2012, Oracle and/or its affiliates. All Rights Reserved.
|
||||
Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify it under
|
||||
the terms of the GNU General Public License as published by the Free Software
|
||||
|
Loading…
x
Reference in New Issue
Block a user