database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2018-04-24 20:59:57 +03:00
parent f79c5a658c 7b5543b21d
commit 7396dfcca7
101 changed files with 705 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/lock.cc
View File

@ -379,7 +379,7 @@ end:
static int lock_external(THD *thd, TABLE **tables, uint count)
{
reg1 uint i;
uint i;
int lock_type,error;
DBUG_ENTER("lock_external");
@ -539,7 +539,7 @@ void mysql_lock_remove(THD *thd, MYSQL_LOCK *locked,TABLE *table)
{
if (locked)
{
reg1 uint i;
uint i;
for (i=0; i < locked->table_count; i++)
{
if (locked->table[i] == table)