diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-03 15:18:09 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-03 15:18:09 +0200 |
| commit | d47add59085492e05b92c55bf8cd11b5f12cc334 (patch) | |
| tree | d5d2a601f2e922dce27a5041739103c6468d4cf8 /include | |
| parent | dbc152204b8af96df60071e495574d0a5bbf0038 (diff) | |
| download | mariadb-git-d47add59085492e05b92c55bf8cd11b5f12cc334.tar.gz | |
Fix that mysqladmin shutdown can be interrupted with ^C
Fixed bug with BLOB keys in BDB tables
Fixed problem with MERGE tables on OS with 32 bit files
Fixed that TIME_TO_SEC() works with negative times
Docs/manual.texi:
Changelog
client/mysqladmin.c:
Fix that mysqladmin shutdown can be interrupted with ^C
include/mysqld_error.h:
Fixed typo
mysql-test/r/func_time.result:
Added test case for negative times
mysql-test/t/func_time.test:
Added test case for negative times
mysql-test/t/rpl000015-slave.sh:
Removed warnings
mysql-test/t/rpl000016-slave.sh:
Removed warnings
sql/field.cc:
Fixed bug with BLOB keys in BDB tables
sql/field.h:
Fixed bug with BLOB keys in BDB tables
sql/ha_berkeley.cc:
Fixed bug with BLOB keys in BDB tables
sql/ha_myisammrg.cc:
Fixed problem with MERGE tables on OS with 32 bit files
sql/item_timefunc.cc:
Fixed that TIME_TO_SEC() works with negative times.
sql/share/swedish/errmsg.txt:
Merge with 4.0
sql/sql_acl.cc:
Fixed typo
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index bfa279193b7..81e0dd1d06d 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -211,7 +211,7 @@ #define ER_DROP_DB_WITH_READ_LOCK 1208 #define ER_CREATE_DB_WITH_READ_LOCK 1209 #define ER_WRONG_ARGUMENTS 1210 -#define ER_NO_PERMISSON_TO_CREATE_USER 1211 +#define ER_NO_PERMISSION_TO_CREATE_USER 1211 #define ER_UNION_TABLES_IN_DIFFERENT_DIR 1212 #define ER_LOCK_DEADLOCK 1213 #define ER_TABLE_CANT_HANDLE_FULLTEXT 1214 |