diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 09:56:20 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 09:56:20 +0200 |
| commit | 0af0e7a70a2ae418716cb6b9be2457e160cee0f5 (patch) | |
| tree | f032354380e8c02e831cce8fbb6e3b36af41ba7d /storage/xtradb/include | |
| parent | 80b3f7470536503ffe1103dda3dea3f29b7c9641 (diff) | |
| parent | 651ac12e8821a994e6176e63eef3e87b70f9746c (diff) | |
| download | mariadb-git-0af0e7a70a2ae418716cb6b9be2457e160cee0f5.tar.gz | |
merge XtraDB 1.1.8-27.0 from Percona-Server-5.5.25a-rel27.1
Diffstat (limited to 'storage/xtradb/include')
| -rw-r--r-- | storage/xtradb/include/srv0srv.h | 1 | ||||
| -rw-r--r-- | storage/xtradb/include/univ.i | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/storage/xtradb/include/srv0srv.h b/storage/xtradb/include/srv0srv.h index e6db7fab158..d99fbfb9463 100644 --- a/storage/xtradb/include/srv0srv.h +++ b/storage/xtradb/include/srv0srv.h @@ -301,6 +301,7 @@ extern ibool srv_print_latch_waits; extern ulint srv_activity_count; extern ulint srv_fatal_semaphore_wait_threshold; +#define SRV_SEMAPHORE_WAIT_EXTENSION 7200 extern ulint srv_dml_needed_delay; extern long long srv_kill_idle_transaction; diff --git a/storage/xtradb/include/univ.i b/storage/xtradb/include/univ.i index f4b06ccefa4..d54b467d2c1 100644 --- a/storage/xtradb/include/univ.i +++ b/storage/xtradb/include/univ.i @@ -54,10 +54,7 @@ Created 1/20/1994 Heikki Tuuri #define INNODB_VERSION_BUGFIX 8 #ifndef PERCONA_INNODB_VERSION -/* this is *not* the version of XtraDB as in Percona-Server sources, - but the version of Percona-Server, where this XtraDB was taken from. - Because Percona does not update XtraDB version for every release */ -#define PERCONA_INNODB_VERSION 26.0 +#define PERCONA_INNODB_VERSION 27.0 #endif /* The following is the InnoDB version as shown in |