Commit e511acba authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jonas/src/mysql-5.0

parents 77b2435e 6ec04a6a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1310,7 +1310,7 @@ enum enum_mysql_completiontype {
  SAVEPOINT_NAME_ROLLBACK=2,
  SAVEPOINT_NAME_RELEASE=4,
  COMMIT_AND_CHAIN=6,
  ROLLBACK_AND_CHAIN=7,
  ROLLBACK_AND_CHAIN=7
};

int mysql_endtrans(THD *thd, enum enum_mysql_completiontype completion,