diff options
| author | Chad MILLER <chad@mysql.com> | 2009-04-14 13:20:13 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2009-04-14 13:20:13 -0400 |
| commit | 3639528967739ace6ca187fd09584289b6ee2216 (patch) | |
| tree | 55596b47965261462217616f8271d0c2b9d79ab0 /sql/lock.cc | |
| parent | 4e72d07e3de71a2d46f1a4d3becea00421e9b026 (diff) | |
| parent | abe7def76437a37c050214a547d255a64ff11b88 (diff) | |
| download | mariadb-git-3639528967739ace6ca187fd09584289b6ee2216.tar.gz | |
Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.clone-5.0.81-build
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index 4927146d96b..3102497576f 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -347,7 +347,7 @@ void mysql_unlock_read_tables(THD *thd, MYSQL_LOCK *sql_lock) for (i= 0; i < sql_lock->table_count; i++) { TABLE *tbl= *table; - tbl->lock_position= table - sql_lock->table; + tbl->lock_position= (uint) (table - sql_lock->table); tbl->lock_data_start= found; found+= tbl->lock_count; table++; @@ -740,7 +740,7 @@ static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table_ptr, uint count, { my_error(ER_OPEN_AS_READONLY,MYF(0),table->alias); /* Clear the lock type of the lock data that are stored already. */ - sql_lock->lock_count= locks - sql_lock->locks; + sql_lock->lock_count= (uint) (locks - sql_lock->locks); reset_lock_data(sql_lock); my_free((gptr) sql_lock,MYF(0)); DBUG_RETURN(0); |