diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-04-28 13:54:37 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-28 13:54:37 +0200 |
| commit | 67a3ddf17abfd182b99e16cc539dc72be5da707b (patch) | |
| tree | 6b20386ca41187ffa358ebb0873d56b97a8e9903 | |
| parent | c581ae08a706a34f8698850ed12689e8d92c421f (diff) | |
| parent | 40e95608d99c2997e4af445ec4da68febc9e87f1 (diff) | |
| download | mariadb-git-67a3ddf17abfd182b99e16cc539dc72be5da707b.tar.gz | |
Merge branch 'merge-xtradb-5.5' into 5.5
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 6 | ||||
| -rw-r--r-- | storage/xtradb/include/univ.i | 4 | ||||
| -rw-r--r-- | storage/xtradb/lock/lock0lock.c | 2 | ||||
| -rw-r--r-- | storage/xtradb/srv/srv0start.c | 15 |
4 files changed, 16 insertions, 11 deletions
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index 2fccd4e63b8..ac883e9ee6b 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -11718,10 +11718,8 @@ ha_innobase::cmp_ref( len1 = innobase_read_from_2_little_endian(ref1); len2 = innobase_read_from_2_little_endian(ref2); - ref1 += 2; - ref2 += 2; - result = ((Field_blob*)field)->cmp( ref1, len1, - ref2, len2); + result = ((Field_blob*)field)->cmp(ref1 + 2, len1, + ref2 + 2, len2); } else { result = field->key_cmp(ref1, ref2); } diff --git a/storage/xtradb/include/univ.i b/storage/xtradb/include/univ.i index 1154e2e2f42..a377911022e 100644 --- a/storage/xtradb/include/univ.i +++ b/storage/xtradb/include/univ.i @@ -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 37.0 +#define PERCONA_INNODB_VERSION 37.1 #endif -#define INNODB_VERSION_STR "5.5.41-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION) +#define INNODB_VERSION_STR "5.5.42-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION) #define REFMAN "http://dev.mysql.com/doc/refman/" \ IB_TO_STR(MYSQL_MAJOR_VERSION) "." \ diff --git a/storage/xtradb/lock/lock0lock.c b/storage/xtradb/lock/lock0lock.c index 7330b066515..9d0151f40f8 100644 --- a/storage/xtradb/lock/lock0lock.c +++ b/storage/xtradb/lock/lock0lock.c @@ -4720,7 +4720,7 @@ loop: } } - if (!srv_print_innodb_lock_monitor && !srv_show_locks_held) { + if (!srv_print_innodb_lock_monitor || !srv_show_locks_held) { nth_trx++; goto loop; } diff --git a/storage/xtradb/srv/srv0start.c b/storage/xtradb/srv/srv0start.c index 8b7e73235da..39a61935aed 100644 --- a/storage/xtradb/srv/srv0start.c +++ b/storage/xtradb/srv/srv0start.c @@ -123,9 +123,16 @@ UNIV_INTERN enum srv_shutdown_state srv_shutdown_state = SRV_SHUTDOWN_NONE; static os_file_t files[1000]; /** io_handler_thread parameters for thread identification */ -static ulint n[SRV_MAX_N_IO_THREADS + 8]; -/** io_handler_thread identifiers */ -static os_thread_id_t thread_ids[SRV_MAX_N_IO_THREADS + 8]; +static ulint n[SRV_MAX_N_IO_THREADS]; +/** io_handler_thread identifiers. The extra elements at the end are allocated +as follows: +SRV_MAX_N_IO_THREADS + 1: srv_master_thread +SRV_MAX_N_IO_THREADS + 2: srv_lock_timeout_thread +SRV_MAX_N_IO_THREADS + 3: srv_error_monitor_thread +SRV_MAX_N_IO_THREADS + 4: srv_monitor_thread +SRV_MAX_N_IO_THREADS + 5: srv_LRU_dump_restore_thread +SRV_MAX_N_IO_THREADS + 6: srv_redo_log_follow_thread */ +static os_thread_id_t thread_ids[SRV_MAX_N_IO_THREADS + 7]; /** We use this mutex to test the return value of pthread_mutex_trylock on successful locking. HP-UX does NOT return 0, though Linux et al do. */ @@ -1194,7 +1201,7 @@ init_log_online(void) /* Create the thread that follows the redo log to output the changed page bitmap */ os_thread_create(&srv_redo_log_follow_thread, NULL, - thread_ids + 5 + SRV_MAX_N_IO_THREADS); + thread_ids + 6 + SRV_MAX_N_IO_THREADS); } } |