mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 18:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

A separate, better error message when it's impossible to aggregate strings for some operation

Browse source
This commit is contained in:
unknown 2003-05-20 16:36:59 +05:00
parent 90c95b9677
commit ccf9895159
28 changed files with 69 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/mysqld_error.h
View file

@ -276,4 +276,5 @@
#define ER_ZLIB_Z_DATA_ERROR 1257 #define ER_ZLIB_Z_DATA_ERROR 1257
#define ER_CUT_VALUE_GROUP_CONCAT 1258 #define ER_CUT_VALUE_GROUP_CONCAT 1258
#define ER_WARN_USING_OTHER_HANDLER 1259 #define ER_WARN_USING_OTHER_HANDLER 1259
#define ER_ERROR_MESSAGES 259 #define ER_CANT_AGGREGATE_COLLATIONS 1260
#define ER_ERROR_MESSAGES 260

13
sql/item.h
View file

@ -41,7 +41,18 @@ public:
enum cond_result { COND_UNDEF,COND_OK,COND_TRUE,COND_FALSE }; enum cond_result { COND_UNDEF,COND_OK,COND_TRUE,COND_FALSE };
enum coercion { COER_COERCIBLE=3, COER_IMPLICIT=2, enum coercion { COER_COERCIBLE=3, COER_IMPLICIT=2,
COER_NOCOLL=1, COER_EXPLICIT=0 }; COER_NOCOLL=1, COER_EXPLICIT=0 };
const char *coercion_name(enum coercion coer) const
{
switch(coer)
{
case COER_COERCIBLE: return "COERCIBLE";
case COER_IMPLICIT: return "IMPLICIT";
case COER_EXPLICIT: return "EXPLICIT";
case COER_NOCOLL: return "NO COLLATION";
default: return "UNKNOWN";
}
}
String str_value; /* used to store value */ String str_value; /* used to store value */
my_string name; /* Name from select */ my_string name; /* Name from select */
Item *next; Item *next;

20
sql/item_cmpfunc.cc
View file

@ -170,7 +170,10 @@ void Item_bool_func2::fix_length_and_dec()
if (set_cmp_charset(args[0]->charset(), args[0]->coercibility, if (set_cmp_charset(args[0]->charset(), args[0]->coercibility,
args[1]->charset(), args[1]->coercibility)) args[1]->charset(), args[1]->coercibility))
{ {
my_error(ER_WRONG_ARGUMENTS,MYF(0),func_name()); my_error(ER_CANT_AGGREGATE_COLLATIONS,MYF(0),
args[0]->charset()->name,coercion_name(args[0]->coercibility),
args[1]->charset()->name,coercion_name(args[1]->coercibility),
func_name());
return; return;
} }
set_cmp_func(); set_cmp_func();
@ -652,7 +655,10 @@ Item_func_ifnull::fix_length_and_dec()
decimals= 0; decimals= 0;
if (set_charset(args[0]->charset(),args[0]->coercibility, if (set_charset(args[0]->charset(),args[0]->coercibility,
args[1]->charset(),args[1]->coercibility)) args[1]->charset(),args[1]->coercibility))
my_error(ER_WRONG_ARGUMENTS,MYF(0),func_name()); my_error(ER_CANT_AGGREGATE_COLLATIONS,MYF(0),
args[0]->charset()->name,coercion_name(args[0]->coercibility),
args[1]->charset()->name,coercion_name(args[1]->coercibility),
func_name());
} }
@ -731,7 +737,10 @@ Item_func_if::fix_length_and_dec()
if (set_charset(args[1]->charset(), args[1]->coercibility, if (set_charset(args[1]->charset(), args[1]->coercibility,
args[2]->charset(), args[2]->coercibility)) args[2]->charset(), args[2]->coercibility))
{ {
my_error(ER_WRONG_ARGUMENTS,MYF(0),func_name()); my_error(ER_CANT_AGGREGATE_COLLATIONS,MYF(0),
args[0]->charset()->name,coercion_name(args[0]->coercibility),
args[1]->charset()->name,coercion_name(args[1]->coercibility),
func_name());
return; return;
} }
} }
@ -1878,7 +1887,10 @@ bool Item_func_like::fix_fields(THD *thd, TABLE_LIST *tlist, Item ** ref)
if (set_cmp_charset(args[0]->charset(), args[0]->coercibility, if (set_cmp_charset(args[0]->charset(), args[0]->coercibility,
args[1]->charset(), args[1]->coercibility)) args[1]->charset(), args[1]->coercibility))
{ {
my_error(ER_WRONG_ARGUMENTS,MYF(0),func_name()); my_error(ER_CANT_AGGREGATE_COLLATIONS,MYF(0),
args[0]->charset()->name,coercion_name(args[0]->coercibility),
args[1]->charset()->name,coercion_name(args[1]->coercibility),
func_name());
return 1; return 1;
} }

5
sql/item_func.cc
View file

@ -859,7 +859,10 @@ void Item_func_min_max::fix_length_and_dec()
else if (set_charset(charset(), coercibility, else if (set_charset(charset(), coercibility,
args[i]->charset(), args[i]->coercibility)) args[i]->charset(), args[i]->coercibility))
{ {
my_error(ER_WRONG_ARGUMENTS,MYF(0),func_name()); my_error(ER_CANT_AGGREGATE_COLLATIONS,MYF(0),
charset()->name,coercion_name(coercibility),
args[i]->charset()->name,coercion_name(args[i]->coercibility),
func_name());
break; break;
} }
} }

15
sql/item_strfunc.cc
View file

@ -326,7 +326,10 @@ void Item_func_concat::fix_length_and_dec()
if (set_charset(charset(), coercibility, if (set_charset(charset(), coercibility,
args[i]->charset(), args[i]->coercibility)) args[i]->charset(), args[i]->coercibility))
{ {
my_error(ER_WRONG_ARGUMENTS,MYF(0),func_name()); my_error(ER_CANT_AGGREGATE_COLLATIONS,MYF(0),
charset()->name,coercion_name(coercibility),
args[i]->charset()->name,coercion_name(args[i]->coercibility),
func_name());
break; break;
} }
} }
@ -630,7 +633,10 @@ void Item_func_concat_ws::fix_length_and_dec()
if (set_charset(charset(), coercibility, if (set_charset(charset(), coercibility,
args[i]->charset(), args[i]->coercibility)) args[i]->charset(), args[i]->coercibility))
{ {
my_error(ER_WRONG_ARGUMENTS,MYF(0),func_name()); my_error(ER_CANT_AGGREGATE_COLLATIONS,MYF(0),
charset()->name,coercion_name(coercibility),
args[i]->charset()->name,coercion_name(args[i]->coercibility),
func_name());
break; break;
} }
} }
@ -1624,7 +1630,10 @@ void Item_func_elt::fix_length_and_dec()
if (set_charset(charset(), coercibility, if (set_charset(charset(), coercibility,
args[i]->charset(), args[i]->coercibility)) args[i]->charset(), args[i]->coercibility))
{ {
my_error(ER_WRONG_ARGUMENTS,MYF(0),func_name()); my_error(ER_CANT_AGGREGATE_COLLATIONS,MYF(0),
charset()->name,coercion_name(coercibility),
args[i]->charset()->name,coercion_name(args[i]->coercibility),
func_name());
break; break;
} }
} }

1
sql/share/czech/errmsg.txt
View file

@ -270,3 +270,4 @@ v/*
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/danish/errmsg.txt
View file

@ -264,3 +264,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/dutch/errmsg.txt
View file

@ -272,3 +272,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/english/errmsg.txt
View file

@ -261,3 +261,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/estonian/errmsg.txt
View file

@ -266,3 +266,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/french/errmsg.txt
View file

@ -261,3 +261,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/german/errmsg.txt
View file

@ -270,3 +270,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/greek/errmsg.txt
View file

@ -261,3 +261,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/hungarian/errmsg.txt
View file

@ -263,3 +263,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/italian/errmsg.txt
View file

@ -261,3 +261,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/japanese/errmsg.txt
View file

@ -263,3 +263,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/korean/errmsg.txt
View file

@ -261,3 +261,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/norwegian-ny/errmsg.txt
View file

@ -263,3 +263,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/norwegian/errmsg.txt
View file

@ -263,3 +263,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/polish/errmsg.txt
View file

@ -265,3 +265,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/portuguese/errmsg.txt
View file

@ -261,3 +261,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/romanian/errmsg.txt
View file

@ -265,3 +265,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/russian/errmsg.txt
View file

@ -263,3 +263,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/serbian/errmsg.txt
View file

@ -257,3 +257,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/slovak/errmsg.txt
View file

@ -269,3 +269,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/spanish/errmsg.txt
View file

@ -262,3 +262,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/swedish/errmsg.txt
View file

@ -261,3 +261,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d rad(er) kapades av group_concat()", "%d rad(er) kapades av group_concat()",
"Använder handler %s för tabell '%s'", "Använder handler %s för tabell '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",

1
sql/share/ukrainian/errmsg.txt
View file

@ -266,3 +266,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib", "Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()", "%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'", "Using storage engine %s for table '%s'",
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",