Skip to content

M
MariaDB
Commit bae46f12 authored by unknown's avatar unknown
Browse files
Options

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into narttu.mysql.fi:/my/mysql-4.1


sql/item_subselect.cc:
  Auto merged
parents 3f896fd8 104da10b
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 55 deletions
include/mysqld_error.h
View file @ bae46f12
...@@ -256,8 +256,8 @@ ...@@ -256,8 +256,8 @@
#define ER_SLAVE_IGNORED_TABLE 1237 #define ER_SLAVE_IGNORED_TABLE 1237
#define ER_WRONG_FK_DEF 1238 #define ER_WRONG_FK_DEF 1238
#define ER_KEY_REF_DO_NOT_MATCH_TABLE_REF 1239 #define ER_KEY_REF_DO_NOT_MATCH_TABLE_REF 1239
#define ER_CARDINALITY_COL 1240 #define ER_OPERAND_COLUMNS 1240
#define ER_SUBSELECT_NO_1_ROW 1241 #define ER_SUBQUERY_NO_1_ROW 1241
#define ER_UNKNOWN_STMT_HANDLER 1242 #define ER_UNKNOWN_STMT_HANDLER 1242
#define ER_CORRUPT_HELP_DB 1243 #define ER_CORRUPT_HELP_DB 1243
#define ER_CYCLIC_REFERENCE 1244 #define ER_CYCLIC_REFERENCE 1244
......
include/sql_state.h
View file @ bae46f12
...@@ -145,8 +145,8 @@ ER_WRONG_TYPE_FOR_VAR, "42000", "", ...@@ -145,8 +145,8 @@ ER_WRONG_TYPE_FOR_VAR, "42000", "",
ER_CANT_USE_OPTION_HERE, "42000", "", ER_CANT_USE_OPTION_HERE, "42000", "",
ER_NOT_SUPPORTED_YET, "42000", "", ER_NOT_SUPPORTED_YET, "42000", "",
ER_WRONG_FK_DEF, "42000", "", ER_WRONG_FK_DEF, "42000", "",
ER_CARDINALITY_COL, "21000", "", ER_OPERAND_COLUMNS, "21000", "",
ER_SUBSELECT_NO_1_ROW, "21000", "", ER_SUBQUERY_NO_1_ROW, "21000", "",
ER_ILLEGAL_REFERENCE, "42S22", "", ER_ILLEGAL_REFERENCE, "42S22", "",
ER_DERIVED_MUST_HAVE_ALIAS, "42000", "", ER_DERIVED_MUST_HAVE_ALIAS, "42000", "",
ER_SELECT_REDUCED, "01000", "", ER_SELECT_REDUCED, "01000", "",
......
mysql-test/r/row.result
View file @ bae46f12
...@@ -36,7 +36,7 @@ select (1,2,(3,4)) IN ((3,2,(3,4)), (1,2,(3,4))); ...@@ -36,7 +36,7 @@ select (1,2,(3,4)) IN ((3,2,(3,4)), (1,2,(3,4)));
(1,2,(3,4)) IN ((3,2,(3,4)), (1,2,(3,4))) (1,2,(3,4)) IN ((3,2,(3,4)), (1,2,(3,4)))
1 1
select row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,4)); select row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,4));
ERROR 21000: Cardinality error (more/less than 2 columns) ERROR 21000: Operand should contain 2 column(s)
select row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,row(3,NULL))); select row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,row(3,NULL)));
row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,row(3,NULL))) row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,row(3,NULL)))
NULL NULL
...@@ -86,7 +86,7 @@ SELECT ROW('test',2,3.33)=ROW('test',2,3.33); ...@@ -86,7 +86,7 @@ SELECT ROW('test',2,3.33)=ROW('test',2,3.33);
ROW('test',2,3.33)=ROW('test',2,3.33) ROW('test',2,3.33)=ROW('test',2,3.33)
1 1
SELECT ROW('test',2,3.33)=ROW('test',2,3.33,4); SELECT ROW('test',2,3.33)=ROW('test',2,3.33,4);
ERROR 21000: Cardinality error (more/less than 3 columns) ERROR 21000: Operand should contain 3 column(s)
SELECT ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,33)); SELECT ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,33));
ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,33)) ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,33))
1 1
...@@ -97,7 +97,7 @@ SELECT ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,NULL)); ...@@ -97,7 +97,7 @@ SELECT ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,NULL));
ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,NULL)) ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,NULL))
NULL NULL
SELECT ROW('test',2,ROW(3,33))=ROW('test',2,4); SELECT ROW('test',2,ROW(3,33))=ROW('test',2,4);
ERROR 21000: Cardinality error (more/less than 2 columns) ERROR 21000: Operand should contain 2 column(s)
create table t1 ( a int, b int, c int); create table t1 ( a int, b int, c int);
insert into t1 values (1,2,3), (2,3,1), (3,2,1), (1,2,NULL); insert into t1 values (1,2,3), (2,3,1), (3,2,1), (1,2,NULL);
select * from t1 where ROW(1,2,3)=ROW(a,b,c); select * from t1 where ROW(1,2,3)=ROW(a,b,c);
...@@ -135,14 +135,14 @@ ROW(1,2,3) IN(row(a,b,c), row(1,2,3)) ...@@ -135,14 +135,14 @@ ROW(1,2,3) IN(row(a,b,c), row(1,2,3))
1 1
drop table t1; drop table t1;
select ROW(1,1); select ROW(1,1);
ERROR 21000: Cardinality error (more/less than 1 columns) ERROR 21000: Operand should contain 1 column(s)
create table t1 (i int); create table t1 (i int);
select 1 from t1 where ROW(1,1); select 1 from t1 where ROW(1,1);
ERROR 21000: Cardinality error (more/less than 1 columns) ERROR 21000: Operand should contain 1 column(s)
select count(*) from t1 order by ROW(1,1); select count(*) from t1 order by ROW(1,1);
ERROR 21000: Cardinality error (more/less than 1 columns) ERROR 21000: Operand should contain 1 column(s)
select count(*) from t1 having (1,1) order by i; select count(*) from t1 having (1,1) order by i;
ERROR 21000: Cardinality error (more/less than 1 columns) ERROR 21000: Operand should contain 1 column(s)
drop table t1; drop table t1;
create table t1 (a int, b int); create table t1 (a int, b int);
insert into t1 values (1, 4); insert into t1 values (1, 4);
......
mysql-test/r/subselect.result
View file @ bae46f12
...@@ -59,7 +59,7 @@ SELECT * FROM (SELECT 1 as id) b WHERE id IN (SELECT * FROM (SELECT 1 as id) c O ...@@ -59,7 +59,7 @@ SELECT * FROM (SELECT 1 as id) b WHERE id IN (SELECT * FROM (SELECT 1 as id) c O
id id
1 1
SELECT * FROM (SELECT 1) a WHERE 1 IN (SELECT 1,1); SELECT * FROM (SELECT 1) a WHERE 1 IN (SELECT 1,1);
ERROR 21000: Cardinality error (more/less than 1 columns) ERROR 21000: Operand should contain 1 column(s)
SELECT 1 IN (SELECT 1); SELECT 1 IN (SELECT 1);
1 IN (SELECT 1) 1 IN (SELECT 1)
1 1
...@@ -124,7 +124,7 @@ SELECT (SELECT 1.5,'c','a') = ROW(1.5,2,'a'); ...@@ -124,7 +124,7 @@ SELECT (SELECT 1.5,'c','a') = ROW(1.5,2,'a');
(SELECT 1.5,'c','a') = ROW(1.5,2,'a') (SELECT 1.5,'c','a') = ROW(1.5,2,'a')
0 0
SELECT (SELECT * FROM (SELECT 'test' a,'test' b) a); SELECT (SELECT * FROM (SELECT 'test' a,'test' b) a);
ERROR 21000: Cardinality error (more/less than 1 columns) ERROR 21000: Operand should contain 1 column(s)
SELECT 1 as a,(SELECT a+a) b,(SELECT b); SELECT 1 as a,(SELECT a+a) b,(SELECT b);
a b (SELECT b) a b (SELECT b)
1 2 2 1 2 2
...@@ -257,9 +257,9 @@ a ...@@ -257,9 +257,9 @@ a
7 7
delete from t2 where a=100; delete from t2 where a=100;
select * from t3 where a in (select a,b from t2); select * from t3 where a in (select a,b from t2);
ERROR 21000: Cardinality error (more/less than 1 columns) ERROR 21000: Operand should contain 1 column(s)
select * from t3 where a in (select * from t2); select * from t3 where a in (select * from t2);
ERROR 21000: Cardinality error (more/less than 1 columns) ERROR 21000: Operand should contain 1 column(s)
insert into t4 values (12,7),(1,7),(10,9),(9,6),(7,6),(3,9),(1,10); insert into t4 values (12,7),(1,7),(10,9),(9,6),(7,6),(3,9),(1,10);
select b,max(a) as ma from t4 group by b having b < (select max(t2.a) from t2 where t2.b=t4.b); select b,max(a) as ma from t4 group by b having b < (select max(t2.a) from t2 where t2.b=t4.b);
b ma b ma
...@@ -346,10 +346,10 @@ id select_type table type possible_keys key key_len ref rows Extra ...@@ -346,10 +346,10 @@ id select_type table type possible_keys key key_len ref rows Extra
3 SUBQUERY t8 const PRIMARY PRIMARY 35 1 3 SUBQUERY t8 const PRIMARY PRIMARY 35 1
SELECT pseudo FROM t8 WHERE pseudo=(SELECT pseudo,email FROM SELECT pseudo FROM t8 WHERE pseudo=(SELECT pseudo,email FROM
t8 WHERE pseudo='joce'); t8 WHERE pseudo='joce');
ERROR 21000: Cardinality error (more/less than 1 columns) ERROR 21000: Operand should contain 1 column(s)
SELECT pseudo FROM t8 WHERE pseudo=(SELECT * FROM t8 WHERE SELECT pseudo FROM t8 WHERE pseudo=(SELECT * FROM t8 WHERE
pseudo='joce'); pseudo='joce');
ERROR 21000: Cardinality error (more/less than 1 columns) ERROR 21000: Operand should contain 1 column(s)
SELECT pseudo FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce'); SELECT pseudo FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce');
pseudo pseudo
joce joce
...@@ -1377,7 +1377,7 @@ userid pmtotal pmnew calc_total calc_new ...@@ -1377,7 +1377,7 @@ userid pmtotal pmnew calc_total calc_new
drop table t1, t2; drop table t1, t2;
create table t1 (s1 char(5)); create table t1 (s1 char(5));
select (select 'a','b' from t1 union select 'a','b' from t1) from t1; select (select 'a','b' from t1 union select 'a','b' from t1) from t1;
ERROR 21000: Cardinality error (more/less than 1 columns) ERROR 21000: Operand should contain 1 column(s)
insert into t1 values ('tttt'); insert into t1 values ('tttt');
select * from t1 where ('a','b')=(select 'a','b' from t1 union select 'a','b' from t1); select * from t1 where ('a','b')=(select 'a','b' from t1 union select 'a','b' from t1);
s1 s1
......
sql/item.cc
View file @ bae46f12
...@@ -108,7 +108,7 @@ bool Item::check_cols(uint c) ...@@ -108,7 +108,7 @@ bool Item::check_cols(uint c)
{ {
if (c != 1) if (c != 1)
{ {
my_error(ER_CARDINALITY_COL, MYF(0), c); my_error(ER_OPERAND_COLUMNS, MYF(0), c);
return 1; return 1;
} }
return 0; return 0;
...@@ -1784,7 +1784,7 @@ void Item_cache_row::illegal_method_call(const char *method) ...@@ -1784,7 +1784,7 @@ void Item_cache_row::illegal_method_call(const char *method)
DBUG_ENTER("Item_cache_row::illegal_method_call"); DBUG_ENTER("Item_cache_row::illegal_method_call");
DBUG_PRINT("error", ("!!! %s method was called for row item", method)); DBUG_PRINT("error", ("!!! %s method was called for row item", method));
DBUG_ASSERT(0); DBUG_ASSERT(0);
my_error(ER_CARDINALITY_COL, MYF(0), 1); my_error(ER_OPERAND_COLUMNS, MYF(0), 1);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
...@@ -1792,7 +1792,7 @@ bool Item_cache_row::check_cols(uint c) ...@@ -1792,7 +1792,7 @@ bool Item_cache_row::check_cols(uint c)
{ {
if (c != item_count) if (c != item_count)
{ {
my_error(ER_CARDINALITY_COL, MYF(0), c); my_error(ER_OPERAND_COLUMNS, MYF(0), c);
return 1; return 1;
} }
return 0; return 0;
......
sql/item_cmpfunc.cc
View file @ bae46f12
...@@ -229,7 +229,7 @@ int Arg_comparator::set_compare_func(Item_bool_func2 *item, Item_result type) ...@@ -229,7 +229,7 @@ int Arg_comparator::set_compare_func(Item_bool_func2 *item, Item_result type)
uint n= (*a)->cols(); uint n= (*a)->cols();
if (n != (*b)->cols()) if (n != (*b)->cols())
{ {
my_error(ER_CARDINALITY_COL, MYF(0), n); my_error(ER_OPERAND_COLUMNS, MYF(0), n);
comparators= 0; comparators= 0;
return 1; return 1;
} }
...@@ -239,7 +239,7 @@ int Arg_comparator::set_compare_func(Item_bool_func2 *item, Item_result type) ...@@ -239,7 +239,7 @@ int Arg_comparator::set_compare_func(Item_bool_func2 *item, Item_result type)
{ {
if ((*a)->el(i)->cols() != (*b)->el(i)->cols()) if ((*a)->el(i)->cols() != (*b)->el(i)->cols())
{ {
my_error(ER_CARDINALITY_COL, MYF(0), (*a)->el(i)->cols()); my_error(ER_OPERAND_COLUMNS, MYF(0), (*a)->el(i)->cols());
return 1; return 1;
} }
comparators[i].set_cmp_func(owner, (*a)->addr(i), (*b)->addr(i)); comparators[i].set_cmp_func(owner, (*a)->addr(i), (*b)->addr(i));
...@@ -423,7 +423,7 @@ bool Item_in_optimizer::fix_fields(THD *thd, struct st_table_list *tables, ...@@ -423,7 +423,7 @@ bool Item_in_optimizer::fix_fields(THD *thd, struct st_table_list *tables,
Item_in_subselect * sub= (Item_in_subselect *)args[1]; Item_in_subselect * sub= (Item_in_subselect *)args[1];
if (args[0]->cols() != sub->engine->cols()) if (args[0]->cols() != sub->engine->cols())
{ {
my_error(ER_CARDINALITY_COL, MYF(0), args[0]->cols()); my_error(ER_OPERAND_COLUMNS, MYF(0), args[0]->cols());
return 1; return 1;
} }
if (args[1]->maybe_null) if (args[1]->maybe_null)
...@@ -1351,7 +1351,7 @@ void cmp_item_row::store_value_by_template(cmp_item *t, Item *item) ...@@ -1351,7 +1351,7 @@ void cmp_item_row::store_value_by_template(cmp_item *t, Item *item)
cmp_item_row *tmpl= (cmp_item_row*) t; cmp_item_row *tmpl= (cmp_item_row*) t;
if (tmpl->n != item->cols()) if (tmpl->n != item->cols())
{ {
my_error(ER_CARDINALITY_COL, MYF(0), tmpl->n); my_error(ER_OPERAND_COLUMNS, MYF(0), tmpl->n);
return; return;
} }
n= tmpl->n; n= tmpl->n;
...@@ -1378,7 +1378,7 @@ int cmp_item_row::cmp(Item *arg) ...@@ -1378,7 +1378,7 @@ int cmp_item_row::cmp(Item *arg)
arg->null_value= 0; arg->null_value= 0;
if (arg->cols() != n) if (arg->cols() != n)
{ {
my_error(ER_CARDINALITY_COL, MYF(0), n); my_error(ER_OPERAND_COLUMNS, MYF(0), n);
return 1; return 1;
} }
bool was_null= 0; bool was_null= 0;
......
sql/item_row.cc
View file @ bae46f12
...@@ -49,7 +49,7 @@ void Item_row::illegal_method_call(const char *method) ...@@ -49,7 +49,7 @@ void Item_row::illegal_method_call(const char *method)
DBUG_ENTER("Item_row::illegal_method_call"); DBUG_ENTER("Item_row::illegal_method_call");
DBUG_PRINT("error", ("!!! %s method was called for row item", method)); DBUG_PRINT("error", ("!!! %s method was called for row item", method));
DBUG_ASSERT(0); DBUG_ASSERT(0);
my_error(ER_CARDINALITY_COL, MYF(0), 1); my_error(ER_OPERAND_COLUMNS, MYF(0), 1);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
...@@ -112,7 +112,7 @@ bool Item_row::check_cols(uint c) ...@@ -112,7 +112,7 @@ bool Item_row::check_cols(uint c)
{ {
if (c != arg_count) if (c != arg_count)
{ {
my_error(ER_CARDINALITY_COL, MYF(0), c); my_error(ER_OPERAND_COLUMNS, MYF(0), c);
return 1; return 1;
} }
return 0; return 0;
......
sql/item_subselect.cc
View file @ bae46f12
...@@ -107,7 +107,7 @@ bool Item_subselect::fix_fields(THD *thd_param, TABLE_LIST *tables, Item **ref) ...@@ -107,7 +107,7 @@ bool Item_subselect::fix_fields(THD *thd_param, TABLE_LIST *tables, Item **ref)
// Is it one field subselect? // Is it one field subselect?
if (engine->cols() > max_columns) if (engine->cols() > max_columns)
{ {
my_error(ER_CARDINALITY_COL, MYF(0), 1); my_error(ER_OPERAND_COLUMNS, MYF(0), 1);
return 1; return 1;
} }
fix_length_and_dec(); fix_length_and_dec();
...@@ -264,7 +264,7 @@ bool Item_singlerow_subselect::check_cols(uint c) ...@@ -264,7 +264,7 @@ bool Item_singlerow_subselect::check_cols(uint c)
{ {
if (c != engine->cols()) if (c != engine->cols())
{ {
my_error(ER_CARDINALITY_COL, MYF(0), c); my_error(ER_OPERAND_COLUMNS, MYF(0), c);
return 1; return 1;
} }
return 0; return 0;
...@@ -529,7 +529,7 @@ Item_in_subselect::single_value_transformer(JOIN *join, ...@@ -529,7 +529,7 @@ Item_in_subselect::single_value_transformer(JOIN *join,
Item *item; Item *item;
if (select_lex->item_list.elements > 1) if (select_lex->item_list.elements > 1)
{ {
my_error(ER_CARDINALITY_COL, MYF(0), 1); my_error(ER_OPERAND_COLUMNS, MYF(0), 1);
DBUG_RETURN(RES_ERROR); DBUG_RETURN(RES_ERROR);
} }
......
sql/share/czech/errmsg.txt
View file @ bae46f12
...@@ -252,7 +252,7 @@ character-set=latin2 ...@@ -252,7 +252,7 @@ character-set=latin2
"Slave SQL thread ignored the query because of replicate-*-table rules", "Slave SQL thread ignored the query because of replicate-*-table rules",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Cardinality error (more/less than %d columns)", "Operand should contain %d column(s)",
"Subquery returns more than 1 row", "Subquery returns more than 1 row",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/share/danish/errmsg.txt
View file @ bae46f12
...@@ -246,7 +246,7 @@ character-set=latin1 ...@@ -246,7 +246,7 @@ character-set=latin1
"Slave SQL thread ignored the query because of replicate-*-table rules", "Slave SQL thread ignored the query because of replicate-*-table rules",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Cardinality error (more/less than %d columns)", "Operand should contain %d column(s)",
"Subquery returns more than 1 row", "Subquery returns more than 1 row",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/share/dutch/errmsg.txt
View file @ bae46f12
...@@ -254,7 +254,7 @@ character-set=latin1 ...@@ -254,7 +254,7 @@ character-set=latin1
"Slave SQL thread ignored the query because of replicate-*-table rules", "Slave SQL thread ignored the query because of replicate-*-table rules",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Cardinality error (more/less than %d columns)", "Operand should contain %d column(s)",
"Subquery returns more than 1 row", "Subquery returns more than 1 row",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/share/english/errmsg.txt
View file @ bae46f12
...@@ -243,7 +243,7 @@ character-set=latin1 ...@@ -243,7 +243,7 @@ character-set=latin1
"Slave SQL thread ignored the query because of replicate-*-table rules", "Slave SQL thread ignored the query because of replicate-*-table rules",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Cardinality error (more/less than %d columns)", "Operand should contain %d column(s)",
"Subquery returns more than 1 row", "Subquery returns more than 1 row",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/share/estonian/errmsg.txt
View file @ bae46f12
...@@ -248,7 +248,7 @@ character-set=latin7 ...@@ -248,7 +248,7 @@ character-set=latin7
"Slave SQL thread ignored the query because of replicate-*-table rules", "Slave SQL thread ignored the query because of replicate-*-table rules",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Cardinality error (more/less than %d columns)", "Operand should contain %d column(s)",
"Subquery returns more than 1 row", "Subquery returns more than 1 row",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/share/french/errmsg.txt
View file @ bae46f12
...@@ -243,7 +243,7 @@ character-set=latin1 ...@@ -243,7 +243,7 @@ character-set=latin1
"Slave SQL thread ignored the query because of replicate-*-table rules", "Slave SQL thread ignored the query because of replicate-*-table rules",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Cardinality error (more/less than %d columns)", "Operand should contain %d column(s)",
"Subquery returns more than 1 row", "Subquery returns more than 1 row",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/share/german/errmsg.txt
View file @ bae46f12
...@@ -252,7 +252,7 @@ character-set=latin1 ...@@ -252,7 +252,7 @@ character-set=latin1
"Slave SQL thread ignored the query because of replicate-*-table rules", "Slave SQL thread ignored the query because of replicate-*-table rules",
"Falsche Foreign-Key Definition für '%-64s': %s", "Falsche Foreign-Key Definition für '%-64s': %s",
"Schlüssel- und Tabellenreferenz passen nicht zueinander.", "Schlüssel- und Tabellenreferenz passen nicht zueinander.",
"Kardinalitäts-Fehler (mehr/oder weniger als %d Spalten).", "Operand should contain %d column(s)",
"Unterabfrage lieferte mehr als einen Datensatz zurück.", "Unterabfrage lieferte mehr als einen Datensatz zurück.",
"Unbekannter prepared statement handler (%ld) für %s angegeben.", "Unbekannter prepared statement handler (%ld) für %s angegeben.",
"Die Hilfedatenbank ist beschädigt oder existiert nicht.", "Die Hilfedatenbank ist beschädigt oder existiert nicht.",
......
sql/share/greek/errmsg.txt
View file @ bae46f12
...@@ -243,7 +243,7 @@ character-set=greek ...@@ -243,7 +243,7 @@ character-set=greek
"Slave SQL thread ignored the query because of replicate-*-table rules", "Slave SQL thread ignored the query because of replicate-*-table rules",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Cardinality error (more/less than %d columns)", "Operand should contain %d column(s)",
"Subquery returns more than 1 row", "Subquery returns more than 1 row",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/share/hungarian/errmsg.txt
View file @ bae46f12
...@@ -245,7 +245,7 @@ character-set=latin2 ...@@ -245,7 +245,7 @@ character-set=latin2
"Slave SQL thread ignored the query because of replicate-*-table rules", "Slave SQL thread ignored the query because of replicate-*-table rules",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Cardinality error (more/less than %d columns)", "Operand should contain %d column(s)",
"Subquery returns more than 1 row", "Subquery returns more than 1 row",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/share/italian/errmsg.txt
View file @ bae46f12
...@@ -243,7 +243,7 @@ character-set=latin1 ...@@ -243,7 +243,7 @@ character-set=latin1
"Slave SQL thread ignored the query because of replicate-*-table rules", "Slave SQL thread ignored the query because of replicate-*-table rules",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Cardinality error (more/less than %d columns)", "Operand should contain %d column(s)",
"Subquery returns more than 1 row", "Subquery returns more than 1 row",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/share/japanese/errmsg.txt
View file @ bae46f12
...@@ -245,7 +245,7 @@ character-set=ujis ...@@ -245,7 +245,7 @@ character-set=ujis
"Slave SQL thread ignored the query because of replicate-*-table rules", "Slave SQL thread ignored the query because of replicate-*-table rules",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Cardinality error (more/less than %d columns)", "Operand should contain %d column(s)",
"Subquery returns more than 1 row", "Subquery returns more than 1 row",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/share/korean/errmsg.txt
View file @ bae46f12
...@@ -243,7 +243,7 @@ character-set=euckr ...@@ -243,7 +243,7 @@ character-set=euckr
"Slave SQL thread ignored the query because of replicate-*-table rules", "Slave SQL thread ignored the query because of replicate-*-table rules",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Cardinality error (more/less than %d columns)", "Operand should contain %d column(s)",
"Subquery returns more than 1 row", "Subquery returns more than 1 row",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/share/norwegian-ny/errmsg.txt
View file @ bae46f12
...@@ -245,7 +245,7 @@ character-set=latin1 ...@@ -245,7 +245,7 @@ character-set=latin1
"Slave SQL thread ignored the query because of replicate-*-table rules", "Slave SQL thread ignored the query because of replicate-*-table rules",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Cardinality error (more/less than %d columns)", "Operand should contain %d column(s)",
"Subquery returns more than 1 row", "Subquery returns more than 1 row",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/share/norwegian/errmsg.txt
View file @ bae46f12
...@@ -245,7 +245,7 @@ character-set=latin1 ...@@ -245,7 +245,7 @@ character-set=latin1
"Slave SQL thread ignored the query because of replicate-*-table rules", "Slave SQL thread ignored the query because of replicate-*-table rules",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Cardinality error (more/less than %d columns)", "Operand should contain %d column(s)",
"Subquery returns more than 1 row", "Subquery returns more than 1 row",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/share/polish/errmsg.txt
View file @ bae46f12
...@@ -247,7 +247,7 @@ character-set=latin2 ...@@ -247,7 +247,7 @@ character-set=latin2
"Slave SQL thread ignored the query because of replicate-*-table rules", "Slave SQL thread ignored the query because of replicate-*-table rules",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Cardinality error (more/less than %d columns)", "Operand should contain %d column(s)",
"Subquery returns more than 1 row", "Subquery returns more than 1 row",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/share/portuguese/errmsg.txt
View file @ bae46f12
...@@ -244,7 +244,7 @@ character-set=latin1 ...@@ -244,7 +244,7 @@ character-set=latin1
"Slave SQL thread ignorado a consulta devido às normas de replicação-*-tabela" "Slave SQL thread ignorado a consulta devido às normas de replicação-*-tabela"
"Definição errada da chave estrangeira para '%-.64s': %s", "Definição errada da chave estrangeira para '%-.64s': %s",
"Referência da chave e referência da tabela não coincidem", "Referência da chave e referência da tabela não coincidem",
"Error de cardinalidade (mais/menos que %d colunas)", "Operand should contain %d column(s)",
"Subconsulta retorna mais que 1 registro", "Subconsulta retorna mais que 1 registro",
"Desconhecido manipulador de declaração preparado (%ld) determinado para %s", "Desconhecido manipulador de declaração preparado (%ld) determinado para %s",
"Banco de dado de ajuda corrupto ou não existente", "Banco de dado de ajuda corrupto ou não existente",
......
sql/share/romanian/errmsg.txt
View file @ bae46f12
...@@ -247,7 +247,7 @@ character-set=latin2 ...@@ -247,7 +247,7 @@ character-set=latin2
"Slave SQL thread ignored the query because of replicate-*-table rules", "Slave SQL thread ignored the query because of replicate-*-table rules",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Cardinality error (more/less than %d columns)", "Operand should contain %d column(s)",
"Subquery returns more than 1 row", "Subquery returns more than 1 row",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/share/russian/errmsg.txt
View file @ bae46f12
...@@ -245,7 +245,7 @@ character-set=koi8r ...@@ -245,7 +245,7 @@ character-set=koi8r
"Slave SQL thread ignored the query because of replicate-*-table rules", "Slave SQL thread ignored the query because of replicate-*-table rules",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
" (/ %d )", " %d ",
" ", " ",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/share/serbian/errmsg.txt
View file @ bae46f12
...@@ -238,7 +238,7 @@ character-set=cp1250 ...@@ -238,7 +238,7 @@ character-set=cp1250
"User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Cardinality error (more/less than %d columns)", "Operand should contain %d column(s)",
"Subquery returns more than 1 row", "Subquery returns more than 1 row",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/share/slovak/errmsg.txt
View file @ bae46f12
...@@ -251,7 +251,7 @@ character-set=latin2 ...@@ -251,7 +251,7 @@ character-set=latin2
"Slave SQL thread ignored the query because of replicate-*-table rules", "Slave SQL thread ignored the query because of replicate-*-table rules",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Cardinality error (more/less than %d columns)", "Operand should contain %d column(s)",
"Subquery returns more than 1 row", "Subquery returns more than 1 row",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/share/spanish/errmsg.txt
View file @ bae46f12
...@@ -245,7 +245,7 @@ character-set=latin1 ...@@ -245,7 +245,7 @@ character-set=latin1
"Slave SQL thread ignorado el query debido a las reglas de replicación-*-tabla" "Slave SQL thread ignorado el query debido a las reglas de replicación-*-tabla"
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Cardinality error (more/less than %d columns)", "Operand should contain %d column(s)",
"Subquery returns more than 1 row", "Subquery returns more than 1 row",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/share/swedish/errmsg.txt
View file @ bae46f12
...@@ -243,7 +243,7 @@ character-set=latin1 ...@@ -243,7 +243,7 @@ character-set=latin1
"Slav SQL tråden ignorerade frågan pga en replicate-*-table regel", "Slav SQL tråden ignorerade frågan pga en replicate-*-table regel",
"Felaktig FOREIGN KEY-definition för '%-.64s': %s", "Felaktig FOREIGN KEY-definition för '%-.64s': %s",
"Nyckelreferensen och tabellreferensen stämmer inte överens", "Nyckelreferensen och tabellreferensen stämmer inte överens",
"Kardinalitetsfel (fler/färre än %d kolumner)", "Operand should contain %d column(s)",
"Subquery returnerade mer än 1 rad", "Subquery returnerade mer än 1 rad",
"Okänd PREPARED STATEMENT id (%ld) var given till %s", "Okänd PREPARED STATEMENT id (%ld) var given till %s",
"Hjälpdatabasen finns inte eller är skadad", "Hjälpdatabasen finns inte eller är skadad",
......
sql/share/ukrainian/errmsg.txt
View file @ bae46f12
...@@ -248,7 +248,7 @@ character-set=koi8u ...@@ -248,7 +248,7 @@ character-set=koi8u
"Slave SQL thread ignored the query because of replicate-*-table rules", "Slave SQL thread ignored the query because of replicate-*-table rules",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Cardinality error (¦/ Φ %d æ)", " %d æ",
" ¦ i 1 ", " ¦ i 1 ",
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
......
sql/sql_class.cc
View file @ bae46f12
...@@ -1023,7 +1023,7 @@ bool select_singlerow_subselect::send_data(List<Item> &items) ...@@ -1023,7 +1023,7 @@ bool select_singlerow_subselect::send_data(List<Item> &items)
Item_singlerow_subselect *it= (Item_singlerow_subselect *)item; Item_singlerow_subselect *it= (Item_singlerow_subselect *)item;
if (it->assigned()) if (it->assigned())
{ {
my_message(ER_SUBSELECT_NO_1_ROW, ER(ER_SUBSELECT_NO_1_ROW), MYF(0)); my_message(ER_SUBQUERY_NO_1_ROW, ER(ER_SUBQUERY_NO_1_ROW), MYF(0));
DBUG_RETURN(1); DBUG_RETURN(1);
} }
if (unit->offset_limit_cnt) if (unit->offset_limit_cnt)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7