Commit e4e89f8c authored by joreland@mysql.com's avatar joreland@mysql.com

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0
parents a1725758 03baacaf
...@@ -1310,7 +1310,7 @@ enum enum_mysql_completiontype { ...@@ -1310,7 +1310,7 @@ enum enum_mysql_completiontype {
SAVEPOINT_NAME_ROLLBACK=2, SAVEPOINT_NAME_ROLLBACK=2,
SAVEPOINT_NAME_RELEASE=4, SAVEPOINT_NAME_RELEASE=4,
COMMIT_AND_CHAIN=6, COMMIT_AND_CHAIN=6,
ROLLBACK_AND_CHAIN=7, ROLLBACK_AND_CHAIN=7
}; };
int mysql_endtrans(THD *thd, enum enum_mysql_completiontype completion, int mysql_endtrans(THD *thd, enum enum_mysql_completiontype completion,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment