Skip to content

Commit 47fefd4

Browse files
dr-mdr-m
committed
Merge 10.6 into 10.11
2 parents 3ee1991 + 1d84cb2 commit 47fefd4

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

‎include/mysql/psi/mysql_file.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ inline_mysql_file_stat(
775775
#ifdef HAVE_PSI_FILE_INTERFACE
776776
struct PSI_file_locker *locker;
777777
PSI_file_locker_state state;
778-
locker= PSI_FILE_CALL(get_thread_file_name_locker)(&state, key, PSI_FILE_STAT, path, &locker);
778+
locker= PSI_FILE_CALL(get_thread_file_name_locker)(&state, key, PSI_FILE_STAT, path, NULL);
779779
if (psi_likely(locker != NULL))
780780
{
781781
PSI_FILE_CALL(start_file_open_wait)(locker, src_file, src_line);
@@ -1025,7 +1025,7 @@ inline_mysql_file_create(
10251025
struct PSI_file_locker *locker;
10261026
PSI_file_locker_state state;
10271027
locker= PSI_FILE_CALL(get_thread_file_name_locker)(&state, key, PSI_FILE_CREATE, filename,
1028-
&locker);
1028+
NULL);
10291029
if (psi_likely(locker != NULL))
10301030
{
10311031
PSI_FILE_CALL(start_file_open_wait)(locker, src_file, src_line);
@@ -1051,7 +1051,7 @@ inline_mysql_file_create_temp(
10511051
struct PSI_file_locker *locker;
10521052
PSI_file_locker_state state;
10531053
locker= PSI_FILE_CALL(get_thread_file_name_locker)
1054-
(&state, key, PSI_FILE_CREATE, NULL, &locker);
1054+
(&state, key, PSI_FILE_CREATE, NULL, NULL);
10551055
if (psi_likely(locker != NULL))
10561056
{
10571057
PSI_FILE_CALL(start_file_open_wait)(locker, src_file, src_line);
@@ -1078,7 +1078,7 @@ inline_mysql_file_open(
10781078
struct PSI_file_locker *locker;
10791079
PSI_file_locker_state state;
10801080
locker= PSI_FILE_CALL(get_thread_file_name_locker)(&state, key, PSI_FILE_OPEN, filename,
1081-
&locker);
1081+
NULL);
10821082
if (psi_likely(locker != NULL))
10831083
{
10841084
PSI_FILE_CALL(start_file_open_wait)(locker, src_file, src_line);
@@ -1298,7 +1298,7 @@ inline_mysql_file_delete(
12981298
#ifdef HAVE_PSI_FILE_INTERFACE
12991299
struct PSI_file_locker *locker;
13001300
PSI_file_locker_state state;
1301-
locker= PSI_FILE_CALL(get_thread_file_name_locker)(&state, key, PSI_FILE_DELETE, name, &locker);
1301+
locker= PSI_FILE_CALL(get_thread_file_name_locker)(&state, key, PSI_FILE_DELETE, name, NULL);
13021302
if (psi_likely(locker != NULL))
13031303
{
13041304
PSI_FILE_CALL(start_file_close_wait)(locker, src_file, src_line);
@@ -1324,7 +1324,7 @@ inline_mysql_file_rename(
13241324
struct PSI_file_locker *locker;
13251325
PSI_file_locker_state state;
13261326
locker= PSI_FILE_CALL(get_thread_file_name_locker)
1327-
(&state, key, PSI_FILE_RENAME, from, &locker);
1327+
(&state, key, PSI_FILE_RENAME, from, NULL);
13281328
if (psi_likely(locker != NULL))
13291329
{
13301330
PSI_FILE_CALL(start_file_wait)(locker, (size_t) 0, src_file, src_line);
@@ -1352,7 +1352,7 @@ inline_mysql_file_create_with_symlink(
13521352
struct PSI_file_locker *locker;
13531353
PSI_file_locker_state state;
13541354
locker= PSI_FILE_CALL(get_thread_file_name_locker)(&state, key, PSI_FILE_CREATE, filename,
1355-
&locker);
1355+
NULL);
13561356
if (psi_likely(locker != NULL))
13571357
{
13581358
PSI_FILE_CALL(start_file_open_wait)(locker, src_file, src_line);
@@ -1383,7 +1383,7 @@ inline_mysql_file_delete_with_symlink(
13831383
struct PSI_file_locker *locker;
13841384
PSI_file_locker_state state;
13851385
locker= PSI_FILE_CALL(get_thread_file_name_locker)(&state, key, PSI_FILE_DELETE, fullname,
1386-
&locker);
1386+
NULL);
13871387
if (psi_likely(locker != NULL))
13881388
{
13891389
PSI_FILE_CALL(start_file_close_wait)(locker, src_file, src_line);
@@ -1410,7 +1410,7 @@ inline_mysql_file_rename_with_symlink(
14101410
struct PSI_file_locker *locker;
14111411
PSI_file_locker_state state;
14121412
locker= PSI_FILE_CALL(get_thread_file_name_locker)
1413-
(&state, key, PSI_FILE_RENAME, from, &locker);
1413+
(&state, key, PSI_FILE_RENAME, from, NULL);
14141414
if (psi_likely(locker != NULL))
14151415
{
14161416
PSI_FILE_CALL(start_file_wait)(locker, (size_t) 0, src_file, src_line);

‎mysys/psi_noop.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ static void set_thread_os_id_noop(PSI_thread *thread NNN)
223223
}
224224

225225
static PSI_thread*
226-
get_thread_noop(void NNN)
226+
get_thread_noop(void)
227227
{
228228
return NULL;
229229
}

‎sql/ha_partition.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -468,11 +468,11 @@ class ha_partition final :public handler
468468
{
469469
return m_is_clone_of;
470470
}
471-
virtual part_id_range *get_part_spec()
471+
part_id_range *get_part_spec()
472472
{
473473
return &m_part_spec;
474474
}
475-
virtual uint get_no_current_part_id()
475+
uint get_no_current_part_id()
476476
{
477477
return NO_CURRENT_PART_ID;
478478
}
@@ -926,7 +926,7 @@ class ha_partition final :public handler
926926
/* Range iterator structure to be supplied to partitions */
927927
RANGE_SEQ_IF m_part_seq_if;
928928

929-
virtual int multi_range_key_create_key(
929+
int multi_range_key_create_key(
930930
RANGE_SEQ_IF *seq,
931931
range_seq_t seq_it
932932
);
@@ -1396,7 +1396,7 @@ class ha_partition final :public handler
13961396
private:
13971397
int reset_auto_increment(ulonglong value) override;
13981398
int update_next_auto_inc_val();
1399-
virtual void lock_auto_increment()
1399+
void lock_auto_increment()
14001400
{
14011401
/* lock already taken */
14021402
if (auto_increment_safe_stmt_log_lock)
@@ -1408,7 +1408,7 @@ class ha_partition final :public handler
14081408
auto_increment_lock= TRUE;
14091409
}
14101410
}
1411-
virtual void unlock_auto_increment()
1411+
void unlock_auto_increment()
14121412
{
14131413
/*
14141414
If auto_increment_safe_stmt_log_lock is true, we have to keep the lock.
@@ -1421,7 +1421,7 @@ class ha_partition final :public handler
14211421
part_share->unlock_auto_inc();
14221422
}
14231423
}
1424-
virtual void set_auto_increment_if_higher(Field *field)
1424+
void set_auto_increment_if_higher(Field *field)
14251425
{
14261426
ulonglong nr= (((Field_num*) field)->unsigned_flag ||
14271427
field->val_int() > 0) ? field->val_int() : 0;

‎storage/csv/ha_tina.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ class ha_tina final : public handler
126126
*/
127127
double scan_time() override { return (double) (stats.records+stats.deleted) / 20.0+10; }
128128
/* The next method will never be called */
129-
virtual bool fast_key_read() { return 1;}
129+
bool fast_key_read() { return 1;}
130130
/*
131131
TODO: return actual upper bound of number of records in the table.
132132
(e.g. save number of records seen on full table scan and/or use file size

‎storage/innobase/include/os0file.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ are used to register file deletion operations*/
452452
src_file, src_line) \
453453
do { \
454454
locker = PSI_FILE_CALL(get_thread_file_name_locker)( \
455-
state, key, op, name, &locker); \
455+
state, key, op, name, nullptr); \
456456
if (locker != NULL) { \
457457
PSI_FILE_CALL(start_file_open_wait)( \
458458
locker, src_file, src_line); \

‎storage/perfschema/pfs.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3247,7 +3247,7 @@ PSI_file_locker*
32473247
pfs_get_thread_file_name_locker_v1(PSI_file_locker_state *state,
32483248
PSI_file_key key,
32493249
PSI_file_operation op,
3250-
const char *name, const void *identity)
3250+
const char *name, const void *)
32513251
{
32523252
assert(static_cast<int> (op) >= 0);
32533253
assert(static_cast<uint> (op) < array_elements(file_operation_map));

0 commit comments

Comments
 (0)