database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse Source
This commit is contained in:
Alexander Barkov
2017-10-02 22:35:13 +04:00
parent 6857cb57fe 387bdf07ae
commit 8ae8cd6348
288 changed files with 1987 additions and 2427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.h
View File

@ -3884,7 +3884,7 @@ public:
mysql_mutex_unlock(&LOCK_thd_data);
#ifdef HAVE_PSI_THREAD_INTERFACE
if (result)
PSI_THREAD_CALL(set_thread_db)(new_db, new_db_len);
PSI_THREAD_CALL(set_thread_db)(new_db, (int) new_db_len);
#endif
return result;
}
@ -3909,7 +3909,7 @@ public:
db_length= new_db_len;
mysql_mutex_unlock(&LOCK_thd_data);
#ifdef HAVE_PSI_THREAD_INTERFACE
PSI_THREAD_CALL(set_thread_db)(new_db, new_db_len);
PSI_THREAD_CALL(set_thread_db)(new_db, (int) new_db_len);
#endif
}
}