mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'merge-xtradb-5.5' into 5.5

Browse source
This commit is contained in:
Sergei Golubchik 2015-04-28 13:54:37 +02:00
commit 67a3ddf17a
4 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/xtradb/handler/ha_innodb.cc
View file

@ -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);
}

4
storage/xtradb/include/univ.i
View file

@ -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) "." \

2
storage/xtradb/lock/lock0lock.c
View file

@ -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;
}

15
storage/xtradb/srv/srv0start.c
View file

@ -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);
}
}