diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-12-11 15:46:39 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-12-11 15:46:39 +0200 |
| commit | 934f5cc4662ded62609ce64be15c54d327cc554e (patch) | |
| tree | 39c72cd72a11f307f9898185deca1854ccf90c57 /innobase/include/db0err.h | |
| parent | 3c9b877b19bd4eaa4734ea5d699add9ca70a4e53 (diff) | |
| download | mariadb-git-934f5cc4662ded62609ce64be15c54d327cc554e.tar.gz | |
Ensure that BEGIN / COMMIT is handled properly if slave dies
Added syntax support for
CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;
Docs/internals.texi:
Update binary protocol description
innobase/include/db0err.h:
Merge from 3.23
mysql-test/r/insert.result:
Updated test result from 3.23
sql/log.cc:
Fixed bug in replication and log rotation
sql/log_event.cc:
Ensure that BEGIN / COMMIT is handled properly if slave dies
sql/slave.cc:
Fixed bug in replication and log rotation
sql/slave.h:
Ensure that BEGIN / COMMIT is handled properly if slave dies
sql/sql_analyse.cc:
Moved usage of res before res is destroyed (by bzero(&s...))
sql/sql_yacc.yy:
Added syntax support for
CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;
To be able to read MySQL 4.1 dump files.
Diffstat (limited to 'innobase/include/db0err.h')
| -rw-r--r-- | innobase/include/db0err.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/innobase/include/db0err.h b/innobase/include/db0err.h index 86b79b65bf2..ae4b0fe4cc5 100644 --- a/innobase/include/db0err.h +++ b/innobase/include/db0err.h @@ -42,7 +42,8 @@ Created 5/24/1996 Heikki Tuuri #define DB_CANNOT_ADD_CONSTRAINT 38 /* adding a foreign key constraint to a table failed */ #define DB_CORRUPTION 39 /* data structure corruption noticed */ - +#define DB_COL_APPEARS_TWICE_IN_INDEX 40 + /* The following are partial failure codes */ #define DB_FAIL 1000 #define DB_OVERFLOW 1001 |