diff options
author | monty@mashka.mysql.fi <> | 2002-07-23 18:31:22 +0300 |
---|---|---|
committer | monty@mashka.mysql.fi <> | 2002-07-23 18:31:22 +0300 |
commit | dddc20d9d1eea5fd526a2082a43801fed304afe4 (patch) | |
tree | 2e458857fc65791ee553b4cde0e28ef9459050a5 /sql/share | |
parent | 373e19dca1d209476a15d7d61cb350361c9d6efa (diff) | |
download | mariadb-git-dddc20d9d1eea5fd526a2082a43801fed304afe4.tar.gz |
New SET syntax & system variables.
Made a some new buffers thread specific and changeable.
Resize of key_buffer.
AUTO_COMMIT -> AUTOCOMMIT
Fixed mutex bug in DROP DATABASE
Fixed bug when using auto_increment as second part of a key where first part could include NULL.
Split handler->extra() to extra() and extra_opt() to be able to support thread specific buffers.
Don't write message to error log when slave reconnects becasue of timeout.
Fixed possible update problem when using DELETE/UPDATE on small tables
(In some cases we used index even if table scanning would be better)
A lot of minior code cleanups
Diffstat (limited to 'sql/share')
-rw-r--r-- | sql/share/czech/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/danish/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/dutch/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/english/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/estonian/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/french/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/german/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/greek/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/hungarian/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/italian/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/japanese/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/korean/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/norwegian-ny/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/norwegian/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/polish/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/portuguese/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/romanian/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/russian/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/slovak/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/spanish/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/swedish/errmsg.txt | 6 | ||||
-rw-r--r-- | sql/share/ukrainian/errmsg.txt | 6 |
22 files changed, 132 insertions, 0 deletions
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt index 70ec831eaa0..f5695a1aeb6 100644 --- a/sql/share/czech/errmsg.txt +++ b/sql/share/czech/errmsg.txt @@ -238,3 +238,9 @@ "Option '%s' used twice in statement", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt index 0aba168d398..f758f3c6c4c 100644 --- a/sql/share/danish/errmsg.txt +++ b/sql/share/danish/errmsg.txt @@ -232,3 +232,9 @@ "Option '%s' used twice in statement", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt index 641cd6c73ae..3081968c537 100644 --- a/sql/share/dutch/errmsg.txt +++ b/sql/share/dutch/errmsg.txt @@ -238,3 +238,9 @@ "Optie '%s' tweemaal gebruikt in opdracht", "Gebruiker '%-.64s' heeft het maximale gebruik van de '%s' faciliteit overschreden (huidige waarde: %ld)", "Toegang geweigerd. U moet het %-.128s privilege hebben voor deze operatie", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index 8845d5fead7..0e480d795c3 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -229,3 +229,9 @@ "Option '%s' used twice in statement", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt index 3939c50f378..603560e31ed 100644 --- a/sql/share/estonian/errmsg.txt +++ b/sql/share/estonian/errmsg.txt @@ -234,3 +234,9 @@ "Määrangut '%s' on lauses kasutatud topelt", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt index 97178218826..807312b41a2 100644 --- a/sql/share/french/errmsg.txt +++ b/sql/share/french/errmsg.txt @@ -229,3 +229,9 @@ "Option '%s' used twice in statement", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt index 19e981539c2..5c0f222bb1b 100644 --- a/sql/share/german/errmsg.txt +++ b/sql/share/german/errmsg.txt @@ -232,3 +232,9 @@ "Option '%s' used twice in statement", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt index c3c9f2e010a..404a9ea5c1d 100644 --- a/sql/share/greek/errmsg.txt +++ b/sql/share/greek/errmsg.txt @@ -229,3 +229,9 @@ "Option '%s' used twice in statement", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt index 5d2589e60f5..658f1161843 100644 --- a/sql/share/hungarian/errmsg.txt +++ b/sql/share/hungarian/errmsg.txt @@ -231,3 +231,9 @@ "Option '%s' used twice in statement", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt index 4a6561c712a..52915d6c143 100644 --- a/sql/share/italian/errmsg.txt +++ b/sql/share/italian/errmsg.txt @@ -229,3 +229,9 @@ "Option '%s' used twice in statement", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt index 3007bc8b0cb..958c04e3d75 100644 --- a/sql/share/japanese/errmsg.txt +++ b/sql/share/japanese/errmsg.txt @@ -231,3 +231,9 @@ "Option '%s' used twice in statement", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt index dc44bb25109..ba5e5023a17 100644 --- a/sql/share/korean/errmsg.txt +++ b/sql/share/korean/errmsg.txt @@ -229,3 +229,9 @@ "Option '%s' used twice in statement", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt index 89cde7754cd..e205cae60d1 100644 --- a/sql/share/norwegian-ny/errmsg.txt +++ b/sql/share/norwegian-ny/errmsg.txt @@ -231,3 +231,9 @@ "Option '%s' used twice in statement", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt index e0c8142a939..4d650b1c439 100644 --- a/sql/share/norwegian/errmsg.txt +++ b/sql/share/norwegian/errmsg.txt @@ -231,3 +231,9 @@ "Option '%s' used twice in statement", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt index 4b67e5f76ea..9ee380b0ab9 100644 --- a/sql/share/polish/errmsg.txt +++ b/sql/share/polish/errmsg.txt @@ -233,3 +233,9 @@ "Option '%s' used twice in statement", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt index 8e416e3dcb2..3906e638ba2 100644 --- a/sql/share/portuguese/errmsg.txt +++ b/sql/share/portuguese/errmsg.txt @@ -229,3 +229,9 @@ "Option '%s' used twice in statement", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt index 1bc22fbb360..ffde33c0e1d 100644 --- a/sql/share/romanian/errmsg.txt +++ b/sql/share/romanian/errmsg.txt @@ -233,3 +233,9 @@ "Option '%s' used twice in statement", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt index 83747310839..fa03d28ee32 100644 --- a/sql/share/russian/errmsg.txt +++ b/sql/share/russian/errmsg.txt @@ -232,3 +232,9 @@ "ïÐÃÉÑ '%s' ÉÓÐÏÌØÚÏ×ÁÎÁ Ä×ÁÖÄÙ", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt index fc23521305c..cb5f62302b6 100644 --- a/sql/share/slovak/errmsg.txt +++ b/sql/share/slovak/errmsg.txt @@ -237,3 +237,9 @@ "Option '%s' used twice in statement", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt index b5f1795bf8f..1b0fbc87241 100644 --- a/sql/share/spanish/errmsg.txt +++ b/sql/share/spanish/errmsg.txt @@ -230,3 +230,9 @@ "Option '%s' used twice in statement", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt index 5cec38202fa..fb948a01083 100644 --- a/sql/share/swedish/errmsg.txt +++ b/sql/share/swedish/errmsg.txt @@ -229,3 +229,9 @@ "Option '%s' användes två gånger", "Användare '%-.64s' har överskridit '%s' (nuvarande värde: %ld)", "Du har inte privlegiet '%-.128s' som behövs för denna operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt index 81530dbd03c..2e7560ed618 100644 --- a/sql/share/ukrainian/errmsg.txt +++ b/sql/share/ukrainian/errmsg.txt @@ -234,3 +234,9 @@ "Option '%s' used twice in statement", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "Access denied. You need the %-.128s privilege for this operation", +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +"Variable '%-.64s' doesn't have a default value", +"Variable '%-.64s' can't be set to the value of '%-.64s'", +"Wrong argument type to variable '%-.64s'", +"Variable '%-.64s' can only be set, not read", |