diff options
| author | unknown <monty@mishka.local> | 2005-08-25 09:38:06 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2005-08-25 09:38:06 +0300 |
| commit | 5baa13ce126763bb66254b52b459bc37e701fa01 (patch) | |
| tree | ed04445facd46f2bf63cc4b447547d80845bd6e6 /sql/handler.cc | |
| parent | 173e5df37fb315099f9e89ce7d686528e24de5c5 (diff) | |
| download | mariadb-git-5baa13ce126763bb66254b52b459bc37e701fa01.tar.gz | |
After merge fixes
mysql-test/r/subselect2.result:
After merge fix
sql/handler.cc:
Remove compiler warning
sql/sql_acl.cc:
After merge fix
sql/sql_db.cc:
After merge fix
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 0b247f83af1..cf1fbfec465 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1023,7 +1023,7 @@ bool mysql_xa_recover(THD *thd) DBUG_RETURN(1); pthread_mutex_lock(&LOCK_xid_cache); - while (xs=(XID_STATE*)hash_element(&xid_cache, i++)) + while ((xs= (XID_STATE*)hash_element(&xid_cache, i++))) { if (xs->xa_state==XA_PREPARED) { |