diff options
author | monty@hundin.mysql.fi <> | 2001-10-31 03:22:31 +0200 |
---|---|---|
committer | monty@hundin.mysql.fi <> | 2001-10-31 03:22:31 +0200 |
commit | 5a9ce774dc413ac7b6342a9097f4e2456d0df63f (patch) | |
tree | a7cd1bf6f7f295d11ffce88081f69bc1963bfd06 /sql/share/norwegian | |
parent | 7f38949c6be7dba794a786b4fe53132f7f5751e5 (diff) | |
download | mariadb-git-5a9ce774dc413ac7b6342a9097f4e2456d0df63f.tar.gz |
Update for OS2 (patch from Yuri Dario).
Use LONG_TIMEOUT (one year) instead of ~0 for long timeouts
Fixed error messages.
Fixed problem with const propagation when comparing columns of different types
Diffstat (limited to 'sql/share/norwegian')
-rwxr-xr-x | sql/share/norwegian/.cvsignore | 1 | ||||
-rw-r--r-- | sql/share/norwegian/errmsg.txt | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/sql/share/norwegian/.cvsignore b/sql/share/norwegian/.cvsignore deleted file mode 100755 index 2f68f259c40..00000000000 --- a/sql/share/norwegian/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -errmsg.sys diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt index d51901b8a21..997d667f812 100644 --- a/sql/share/norwegian/errmsg.txt +++ b/sql/share/norwegian/errmsg.txt @@ -217,15 +217,6 @@ "%-.32s@%-.64s is not allowed to create new users", "Incorrect table definition; All MERGE tables must be in the same database", "Deadlock found when trying to get lock; Try restarting transaction", -"Deadlock found when trying to get lock; Try restarting transaction", -"Dummy error message: this error number should only occur in MySQL-4", -"Dummy error message: this error number should only occur in MySQL-4", -"Dummy error message: this error number should only occur in MySQL-4", -"Dummy error message: this error number should only occur in MySQL-4", -"Dummy error message: this error number should only occur in MySQL-4", -"Dummy error message: this error number should only occur in MySQL-4", -"Dummy error message: this error number should only occur in MySQL-4", -"Dummy error message: this error number should only occur in MySQL-4", "The used table type doesn't support FULLTEXT indexes", "Cannot add foreign key constraint", "Cannot add a child row: a foreign key constraint fails", |