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

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

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
e511acba · unknown · 77b2435e · 6ec04a6a · e511acba
Commit e511acba authored Feb 10, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_parse.cc sql/sql_parse.cc +1 -1

No files found.
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -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,