@@ -143,7 +143,7 @@ PFS_thread *thread_array= NULL;
143
143
File instrumentation instances array.
144
144
@sa file_max
145
145
@sa file_lost
146
- @sa filename_hash
146
+ @sa pfs_filename_hash
147
147
*/
148
148
PFS_file *file_array= NULL ;
149
149
@@ -189,8 +189,8 @@ static unsigned char *history_stmts_digest_token_array= NULL;
189
189
static char *thread_session_connect_attrs_array= NULL ;
190
190
191
191
/* * Hash table for instrumented files. */
192
- LF_HASH filename_hash ;
193
- /* * True if filename_hash is initialized. */
192
+ LF_HASH pfs_filename_hash ;
193
+ /* * True if pfs_filename_hash is initialized. */
194
194
static bool filename_hash_inited= false ;
195
195
196
196
/* *
@@ -586,7 +586,7 @@ int init_file_hash(void)
586
586
{
587
587
if ((! filename_hash_inited) && (file_max > 0 ))
588
588
{
589
- lf_hash_init (&filename_hash , sizeof (PFS_file*), LF_HASH_UNIQUE,
589
+ lf_hash_init (&pfs_filename_hash , sizeof (PFS_file*), LF_HASH_UNIQUE,
590
590
0 , 0 , filename_hash_get_key, &my_charset_bin);
591
591
/* filename_hash.size= file_max; */
592
592
filename_hash_inited= true ;
@@ -599,7 +599,7 @@ void cleanup_file_hash(void)
599
599
{
600
600
if (filename_hash_inited)
601
601
{
602
- lf_hash_destroy (&filename_hash );
602
+ lf_hash_destroy (&pfs_filename_hash );
603
603
filename_hash_inited= false ;
604
604
}
605
605
}
@@ -1186,7 +1186,7 @@ void destroy_thread(PFS_thread *pfs)
1186
1186
}
1187
1187
1188
1188
/* *
1189
- Get the hash pins for @filename_hash .
1189
+ Get the hash pins for @pfs_filename_hash .
1190
1190
@param thread The running thread.
1191
1191
@returns The LF_HASH pins for the thread.
1192
1192
*/
@@ -1196,7 +1196,7 @@ LF_PINS* get_filename_hash_pins(PFS_thread *thread)
1196
1196
{
1197
1197
if (! filename_hash_inited)
1198
1198
return NULL ;
1199
- thread->m_filename_hash_pins = lf_hash_get_pins (&filename_hash );
1199
+ thread->m_filename_hash_pins = lf_hash_get_pins (&pfs_filename_hash );
1200
1200
}
1201
1201
return thread->m_filename_hash_pins ;
1202
1202
}
@@ -1314,7 +1314,7 @@ find_or_create_file(PFS_thread *thread, PFS_file_class *klass,
1314
1314
search:
1315
1315
1316
1316
entry= reinterpret_cast <PFS_file**>
1317
- (lf_hash_search (&filename_hash , pins,
1317
+ (lf_hash_search (&pfs_filename_hash , pins,
1318
1318
normalized_filename, normalized_length));
1319
1319
if (entry && (entry != MY_ERRPTR))
1320
1320
{
@@ -1359,7 +1359,7 @@ find_or_create_file(PFS_thread *thread, PFS_file_class *klass,
1359
1359
pfs->m_identity = (const void *)pfs;
1360
1360
1361
1361
int res;
1362
- res= lf_hash_insert (&filename_hash , thread->m_filename_hash_pins ,
1362
+ res= lf_hash_insert (&pfs_filename_hash , thread->m_filename_hash_pins ,
1363
1363
&pfs);
1364
1364
if (likely (res == 0 ))
1365
1365
{
@@ -1426,7 +1426,7 @@ void destroy_file(PFS_thread *thread, PFS_file *pfs)
1426
1426
LF_PINS *pins= get_filename_hash_pins (thread);
1427
1427
DBUG_ASSERT (pins != NULL );
1428
1428
1429
- lf_hash_delete (&filename_hash , pins,
1429
+ lf_hash_delete (&pfs_filename_hash , pins,
1430
1430
pfs->m_filename , pfs->m_filename_length );
1431
1431
if (klass->is_singleton ())
1432
1432
klass->m_singleton = NULL ;
0 commit comments