summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <evgen@moonbone.local>2007-07-31 17:42:48 +0400
committerunknown <evgen@moonbone.local>2007-07-31 17:42:48 +0400
commita0af9b7e63e14c76aac2a16a75928855f93b288f (patch)
tree5762b9c26a6ed50b75ae63a63d01a13005c6337f
parent3887705e09a943f02a831380af3deebef2516443 (diff)
downloadmariadb-git-a0af9b7e63e14c76aac2a16a75928855f93b288f.tar.gz
ha_innodb.cc:
Warning fixed. sql/ha_innodb.cc: Warning fixed.
-rw-r--r--sql/ha_innodb.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 585c825c710..f87d47174ac 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -465,7 +465,8 @@ convert_error_code_to_mysql(
latest SQL statement in a lock wait timeout. Previously, we
rolled back the whole transaction. */
- mark_transaction_to_rollback(thd, row_rollback_on_timeout);
+ mark_transaction_to_rollback(thd,
+ (bool)row_rollback_on_timeout);
return(HA_ERR_LOCK_WAIT_TIMEOUT);