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 | b2cec26dfb0fa6e2e7240d5dd2044e1192596ef8 (patch) | |
| tree | d5d2a601f2e922dce27a5041739103c6468d4cf8 /sql/sql_acl.cc | |
| parent | b9e1b930f73a43c739a916254fdbb46641cd51a0 (diff) | |
| download | mariadb-git-b2cec26dfb0fa6e2e7240d5dd2044e1192596ef8.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 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 835b873aee6..ce66b60a49f 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1003,8 +1003,8 @@ static int replace_user_table(TABLE *table, const LEX_USER &combo, my_printf_error(ER_NONEXISTING_GRANT,ER(ER_NONEXISTING_GRANT), MYF(0),combo.user.str,combo.host.str); else - my_printf_error(ER_NO_PERMISSON_TO_CREATE_USER, - ER(ER_NO_PERMISSON_TO_CREATE_USER), + my_printf_error(ER_NO_PERMISSION_TO_CREATE_USER, + ER(ER_NO_PERMISSION_TO_CREATE_USER), MYF(0),thd->user, thd->host ? thd->host : thd->ip ? thd->ip: ""); error= -1; |