diff options
author | unknown <monty@mashka.mysql.fi> | 2002-07-24 19:55:08 +0300 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2002-07-24 19:55:08 +0300 |
commit | 72dec69046e315080d17e4764f911c4c9f29459c (patch) | |
tree | 31ee919bea7e4456572b62d5ea7302dc58bc0b6a /sql/share | |
parent | c911e9d72161045364893a838624c1484590a9cb (diff) | |
download | mariadb-git-72dec69046e315080d17e4764f911c4c9f29459c.tar.gz |
Removed wrong implementation of CUBE/ROLLUP
Fixed bugfix of INSERT ... SET db_name.table_name.column_name
Changed locking to external-locking
Fix client hangup for some invalid SQL queries.
Docs/manual.texi:
Changelog & recent incompatible changes to 4.0.3
include/mysqld_error.h:
New error messages
myisam/ft_boolean_search.c:
Removed compiler warning
myisam/mi_check.c:
Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_dynrec.c:
Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_extra.c:
Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_key.c:
Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_open.c:
Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_packrec.c:
Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/myisamdef.h:
Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/sort.c:
Fixed uninitialized variable
mysql-test/r/insert_set.result:
Change test case to use database foo
mysql-test/r/union.result:
Test wrong usage of union
mysql-test/t/insert_set.test:
Test bug in insert
mysql-test/t/union.test:
Test wrong usage of union
sql/item.h:
Indentation cleanup
sql/item_cmpfunc.h:
Indentation cleanup
sql/item_func.h:
Indentation cleanup
sql/item_strfunc.h:
Indentation cleanup
sql/item_sum.h:
Indentation cleanup
sql/item_timefunc.h:
Indentation cleanup
sql/item_uniq.h:
Indentation cleanup
sql/mysql_priv.h:
Fix that we always generate an error message when calling YYABORT
sql/mysqld.cc:
Changed command line arguments regarding locking to always use --external-locking
Disable external locking by default
sql/procedure.h:
Cleanup
sql/set_var.cc:
change locking -> external_locking
sql/share/czech/errmsg.txt:
New error messages
sql/share/danish/errmsg.txt:
New error messages
sql/share/dutch/errmsg.txt:
New error messages
sql/share/english/errmsg.txt:
New error messages
sql/share/estonian/errmsg.txt:
New error messages
sql/share/french/errmsg.txt:
New error messages
sql/share/german/errmsg.txt:
New error messages
sql/share/greek/errmsg.txt:
New error messages
sql/share/hungarian/errmsg.txt:
New error messages
sql/share/italian/errmsg.txt:
New error messages
sql/share/japanese/errmsg.txt:
New error messages
sql/share/korean/errmsg.txt:
New error messages
mysql-test/r/olap.result:
Removed CUBE/ROLLUP
mysql-test/t/olap.test:
Removed CUBE/ROLLUP
sql/share/norwegian-ny/errmsg.txt:
New error messages
sql/share/norwegian/errmsg.txt:
New error messages
sql/share/polish/errmsg.txt:
New error messages
sql/share/portuguese/errmsg.txt:
New error messages
sql/share/romanian/errmsg.txt:
New error messages
sql/share/russian/errmsg.txt:
New error messages
sql/share/slovak/errmsg.txt:
New error messages
sql/share/spanish/errmsg.txt:
New error messages
sql/share/swedish/errmsg.txt:
New error messages
sql/share/ukrainian/errmsg.txt:
New error messages
sql/sql_base.cc:
Removed wrong patch for INSERT...
sql/sql_insert.cc:
Fix bug in INSERT ... SET db_name.table_name.column_name
sql/sql_lex.h:
Changed NON_EXISTIONG_ONE -> UNSPECIFIED_OLAP_TYPE
sql/sql_olap.cc:
Removed wrong implementation of CUBE/ROLLUP
sql/sql_parse.cc:
Removed wrong implementation of CUBE/ROLLUP
Added function to give better error messages
sql/sql_select.cc:
Removed wrong implementation of CUBE/ROLLUP
sql/sql_union.cc:
Added comment
sql/sql_yacc.yy:
Fix that we always generate an error message when calling YYABORT
Diffstat (limited to 'sql/share')
-rw-r--r-- | sql/share/czech/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/danish/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/dutch/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/english/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/estonian/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/french/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/german/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/greek/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/hungarian/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/italian/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/japanese/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/korean/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/norwegian-ny/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/norwegian/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/polish/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/portuguese/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/romanian/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/russian/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/slovak/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/spanish/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/swedish/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/ukrainian/errmsg.txt | 2 |
22 files changed, 44 insertions, 0 deletions
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt index f5695a1aeb6..18b4c3ad2a8 100644 --- a/sql/share/czech/errmsg.txt +++ b/sql/share/czech/errmsg.txt @@ -244,3 +244,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt index f758f3c6c4c..7d409e3133f 100644 --- a/sql/share/danish/errmsg.txt +++ b/sql/share/danish/errmsg.txt @@ -238,3 +238,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt index 3081968c537..4a674999c82 100644 --- a/sql/share/dutch/errmsg.txt +++ b/sql/share/dutch/errmsg.txt @@ -244,3 +244,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index 0e480d795c3..04150b67084 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -235,3 +235,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt index 603560e31ed..2a0233ca949 100644 --- a/sql/share/estonian/errmsg.txt +++ b/sql/share/estonian/errmsg.txt @@ -240,3 +240,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt index 807312b41a2..42f83e6eed2 100644 --- a/sql/share/french/errmsg.txt +++ b/sql/share/french/errmsg.txt @@ -235,3 +235,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt index 5c0f222bb1b..0cd3f8cd902 100644 --- a/sql/share/german/errmsg.txt +++ b/sql/share/german/errmsg.txt @@ -238,3 +238,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt index 404a9ea5c1d..bed0afe8286 100644 --- a/sql/share/greek/errmsg.txt +++ b/sql/share/greek/errmsg.txt @@ -235,3 +235,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt index 658f1161843..a3c4f945351 100644 --- a/sql/share/hungarian/errmsg.txt +++ b/sql/share/hungarian/errmsg.txt @@ -237,3 +237,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt index 52915d6c143..39c9635cc91 100644 --- a/sql/share/italian/errmsg.txt +++ b/sql/share/italian/errmsg.txt @@ -235,3 +235,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt index 958c04e3d75..f146f03e687 100644 --- a/sql/share/japanese/errmsg.txt +++ b/sql/share/japanese/errmsg.txt @@ -237,3 +237,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt index ba5e5023a17..c3ab3d5d680 100644 --- a/sql/share/korean/errmsg.txt +++ b/sql/share/korean/errmsg.txt @@ -235,3 +235,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt index e205cae60d1..a0191ba86d7 100644 --- a/sql/share/norwegian-ny/errmsg.txt +++ b/sql/share/norwegian-ny/errmsg.txt @@ -237,3 +237,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt index 4d650b1c439..8d87c00e1b3 100644 --- a/sql/share/norwegian/errmsg.txt +++ b/sql/share/norwegian/errmsg.txt @@ -237,3 +237,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt index 9ee380b0ab9..def94b8795a 100644 --- a/sql/share/polish/errmsg.txt +++ b/sql/share/polish/errmsg.txt @@ -239,3 +239,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt index 3906e638ba2..868bb42b6be 100644 --- a/sql/share/portuguese/errmsg.txt +++ b/sql/share/portuguese/errmsg.txt @@ -235,3 +235,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt index ffde33c0e1d..fd12a1f3a64 100644 --- a/sql/share/romanian/errmsg.txt +++ b/sql/share/romanian/errmsg.txt @@ -239,3 +239,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt index fa03d28ee32..dfe3b4a2f92 100644 --- a/sql/share/russian/errmsg.txt +++ b/sql/share/russian/errmsg.txt @@ -238,3 +238,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt index cb5f62302b6..8e9433396fc 100644 --- a/sql/share/slovak/errmsg.txt +++ b/sql/share/slovak/errmsg.txt @@ -243,3 +243,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt index 1b0fbc87241..57314579c63 100644 --- a/sql/share/spanish/errmsg.txt +++ b/sql/share/spanish/errmsg.txt @@ -236,3 +236,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt index fb948a01083..7a4d17cfdfa 100644 --- a/sql/share/swedish/errmsg.txt +++ b/sql/share/swedish/errmsg.txt @@ -235,3 +235,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt index 2e7560ed618..d8d9349b56a 100644 --- a/sql/share/ukrainian/errmsg.txt +++ b/sql/share/ukrainian/errmsg.txt @@ -240,3 +240,5 @@ "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", +"Wrong usage/placement of '%s'", +"This version of MySQL doesn't yet support '%s'," |