mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

percona-server-5.5.42-37.1.tar.gz

Browse source
This commit is contained in:
Sergei Golubchik 2015-04-28 13:42:58 +02:00
parent fd39c56eff
commit 40e95608d9
4 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11490,10 +11490,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);
}
@ -13752,6 +13750,10 @@ ib_warn_row_too_big(const dict_table_t* table)
THD* thd = current_thd;
if (thd == NULL) {
return;
}
push_warning_printf(
thd, MYSQL_ERROR::WARN_LEVEL_WARN, HA_ERR_TO_BIG_ROW,
"Row size too large (> %lu). Changing some columns to TEXT"

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

@ -64,7 +64,7 @@ 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 MYSQL_SERVER_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

@ -122,9 +122,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. */
@ -1184,7 +1191,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);
}
}