Skip to content

M
mariadb
Commit b478c41d authored by unknown's avatar unknown
Browse files
Options

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

into mashka.(none):/home/my/mysql-4.1


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parents b7a9b57a 4b3eecf4
Show whitespace changes
Inline Side-by-side
Showing with 235 additions and 134 deletions
BitKeeper/etc/logging_ok
View file @ b478c41d
......@@ -63,6 +63,7 @@ monty@bitch.mysql.fi
monty@butch.
monty@donna.mysql.fi
monty@hundin.mysql.fi
monty@mashka.(none)
monty@mashka.mysql.fi
monty@narttu.
monty@narttu.mysql.fi
......
client/mysql.cc
View file @ b478c41d
......@@ -1085,7 +1085,7 @@ static bool add_line(String &buffer,char *line,char *in_string,
out=line;
}
}
else if (*ml_comment && !*in_string && inchar == '*' && *(pos+1) == '/')
else if (*ml_comment && inchar == '*' && *(pos + 1) == '/')
{
pos++;
*ml_comment= 0;
......@@ -1093,11 +1093,13 @@ static bool add_line(String &buffer,char *line,char *in_string,
else
{ // Add found char to buffer
if (inchar == *in_string)
*in_string=0;
else if (!*in_string && (inchar == '\'' || inchar == '"' || inchar == '`'))
*in_string=(char) inchar;
if (!(*ml_comment))
*out++ = (char) inchar;
*in_string= 0;
else if (!*ml_comment)
{
if (!*in_string && (inchar == '\'' || inchar == '"' || inchar == '`'))
*in_string= (char) inchar;
*out++= (char) inchar;
}
}
}
if (out != line || !buffer.is_empty())
......
mysql-test/r/alter_table.result
View file @ b478c41d
......@@ -281,3 +281,42 @@ ALTER TABLE t1 DISABLE KEYS;
INSERT DELAYED INTO t1 VALUES(1),(2),(3);
ALTER TABLE t1 ENABLE KEYS;
drop table t1;
set names koi8r;
create table t1 (a char(10) character set koi8r);
insert into t1 values ('');
select a,hex(a) from t1;
a hex(a)
D4C5D3D4
alter table t1 change a a char(10) character set cp1251;
select a,hex(a) from t1;
a hex(a)
F2E5F1F2
alter table t1 change a a char(10) binary;
select a,hex(a) from t1;
a hex(a)
F2E5F1F2
alter table t1 change a a char(10) character set cp1251;
select a,hex(a) from t1;
a hex(a)
F2E5F1F2
alter table t1 change a a char(10) character set koi8r;
select a,hex(a) from t1;
a hex(a)
D4C5D3D4
alter table t1 change a a varchar(10) character set cp1251;
select a,hex(a) from t1;
a hex(a)
F2E5F1F2
alter table t1 change a a char(10) character set koi8r;
select a,hex(a) from t1;
a hex(a)
D4C5D3D4
alter table t1 change a a text character set cp1251;
select a,hex(a) from t1;
a hex(a)
F2E5F1F2
alter table t1 change a a char(10) character set koi8r;
select a,hex(a) from t1;
a hex(a)
D4C5D3D4
drop table t1;
mysql-test/r/case.result
View file @ b478c41d
......@@ -71,3 +71,24 @@ orange
yellow
green
drop table t1;
SET NAMES latin1;
CREATE TABLE t1 SELECT COALESCE(_latin1'a',_latin2'a');
ERROR HY000: Illegal mix of collations (latin1_swedish_ci,COERCIBLE) and (latin2_general_ci,COERCIBLE) for operation 'coalesce'
CREATE TABLE t1 SELECT COALESCE('a' COLLATE latin1_swedish_ci,'b' COLLATE latin1_bin);
ERROR HY000: Illegal mix of collations (latin1_swedish_ci,EXPLICIT) and (latin1_bin,EXPLICIT) for operation 'coalesce'
CREATE TABLE t1 SELECT
COALESCE(1), COALESCE(1.0),COALESCE('a'),
COALESCE(1,1.0), COALESCE(1,'1'),COALESCE(1.1,'1'),
COALESCE('a' COLLATE latin1_bin,'b');
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`COALESCE(1)` int(1) NOT NULL default '0',
`COALESCE(1.0)` double(3,1) NOT NULL default '0.0',
`COALESCE('a')` char(1) NOT NULL default '',
`COALESCE(1,1.0)` double(3,1) NOT NULL default '0.0',
`COALESCE(1,'1')` char(1) NOT NULL default '',
`COALESCE(1.1,'1')` char(3) NOT NULL default '',
`COALESCE('a' COLLATE latin1_bin,'b')` char(1) character set latin1 collate latin1_bin NOT NULL default ''
) TYPE=MyISAM CHARSET=latin1
DROP TABLE t1;
mysql-test/r/func_str.result
View file @ b478c41d
......@@ -297,9 +297,9 @@ select FIELD('b','A' COLLATE latin1_bin,'B');
FIELD('b','A' COLLATE latin1_bin,'B')
0
select FIELD(_latin2'b','A','B');
ERROR HY000: Illegal mix of collations for operation 'field'
Illegal mix of collations (latin2_general_ci,COERCIBLE), (latin1_swedish_ci,COERCIBLE), (latin1_swedish_ci,COERCIBLE) for operation 'field'
select FIELD('b',_latin2'A','B');
ERROR HY000: Illegal mix of collations for operation 'field'
Illegal mix of collations (latin1_swedish_ci,COERCIBLE), (latin2_general_ci,COERCIBLE), (latin1_swedish_ci,COERCIBLE) for operation 'field'
select FIELD('b',_latin2'A','B',1);
FIELD('b',_latin2'A','B',1)
1
......@@ -532,3 +532,24 @@ t1 CREATE TABLE `t1` (
`replace(_latin2'abcd',_latin2'b',_latin2'B')` char(4) character set latin2 NOT NULL default ''
) TYPE=MyISAM CHARSET=latin1
drop table t1;
select SUBSTR('abcdefg',3,2);
SUBSTR('abcdefg',3,2)
cd
select SUBSTRING('abcdefg',3,2);
SUBSTRING('abcdefg',3,2)
cd
select SUBSTR('abcdefg',-3,2) FROM DUAL;
SUBSTR('abcdefg',-3,2)
ef
select SUBSTR('abcdefg',-1,5) FROM DUAL;
SUBSTR('abcdefg',-1,5)
g
select SUBSTR('abcdefg',0,0) FROM DUAL;
SUBSTR('abcdefg',0,0)
select SUBSTR('abcdefg',-1,-1) FROM DUAL;
SUBSTR('abcdefg',-1,-1)
select SUBSTR('abcdefg',1,-1) FROM DUAL;
SUBSTR('abcdefg',1,-1)
mysql-test/t/alter_table.test
View file @ b478c41d
......@@ -144,3 +144,30 @@ ALTER TABLE t1 DISABLE KEYS;
INSERT DELAYED INTO t1 VALUES(1),(2),(3);
ALTER TABLE t1 ENABLE KEYS;
drop table t1;
#
# Test that data get converted when character set is changed
# Test that data doesn't get converted when src or dst is BINARY/BLOB
#
set names koi8r;
create table t1 (a char(10) character set koi8r);
insert into t1 values ('');
select a,hex(a) from t1;
alter table t1 change a a char(10) character set cp1251;
select a,hex(a) from t1;
alter table t1 change a a char(10) binary;
select a,hex(a) from t1;
alter table t1 change a a char(10) character set cp1251;
select a,hex(a) from t1;
alter table t1 change a a char(10) character set koi8r;
select a,hex(a) from t1;
alter table t1 change a a varchar(10) character set cp1251;
select a,hex(a) from t1;
alter table t1 change a a char(10) character set koi8r;
select a,hex(a) from t1;
alter table t1 change a a text character set cp1251;
select a,hex(a) from t1;
alter table t1 change a a char(10) character set koi8r;
select a,hex(a) from t1;
drop table t1;
mysql-test/t/case.test
View file @ b478c41d
......@@ -41,3 +41,25 @@ create table t1 (row int not null, col int not null, val varchar(255) not null);
insert into t1 values (1,1,'orange'),(1,2,'large'),(2,1,'yellow'),(2,2,'medium'),(3,1,'green'),(3,2,'small');
select max(case col when 1 then val else null end) as color from t1 group by row;
drop table t1;
#
# COALESCE is a CASE abbrevation:
#
# COALESCE(v1,v2) == CASE WHEN v1 IS NOT NULL THEN v1 ELSE v2 END
#
# COALESCE(V1, V2, . . . ,Vn ) =
# CASE WHEN V1 IS NOT NULL THEN V1 ELSE COALESCE (V2, . . . ,Vn) END
#
# Check COALESCE argument types aggregation
SET NAMES latin1;
--error 1265
CREATE TABLE t1 SELECT COALESCE(_latin1'a',_latin2'a');
--error 1265
CREATE TABLE t1 SELECT COALESCE('a' COLLATE latin1_swedish_ci,'b' COLLATE latin1_bin);
CREATE TABLE t1 SELECT
COALESCE(1), COALESCE(1.0),COALESCE('a'),
COALESCE(1,1.0), COALESCE(1,'1'),COALESCE(1.1,'1'),
COALESCE('a' COLLATE latin1_bin,'b');
SHOW CREATE TABLE t1;
DROP TABLE t1;
mysql-test/t/func_str.test
View file @ b478c41d
......@@ -167,9 +167,9 @@ select FIELD('b','A','B');
select FIELD('B','A','B');
select FIELD('b' COLLATE latin1_bin,'A','B');
select FIELD('b','A' COLLATE latin1_bin,'B');
--error 1269
--error 1265
select FIELD(_latin2'b','A','B');
--error 1269
--error 1265
select FIELD('b',_latin2'A','B');
select FIELD('b',_latin2'A','B',1);
......@@ -294,3 +294,14 @@ select
;
show create table t1;
drop table t1;
#
# test for SUBSTR
#
select SUBSTR('abcdefg',3,2);
select SUBSTRING('abcdefg',3,2);
select SUBSTR('abcdefg',-3,2) FROM DUAL;
select SUBSTR('abcdefg',-1,5) FROM DUAL;
select SUBSTR('abcdefg',0,0) FROM DUAL;
select SUBSTR('abcdefg',-1,-1) FROM DUAL;
select SUBSTR('abcdefg',1,-1) FROM DUAL;
sql/item_cmpfunc.cc
View file @ b478c41d
......@@ -1149,7 +1149,13 @@ void Item_func_coalesce::fix_length_and_dec()
{
set_if_bigger(max_length,args[i]->max_length);
set_if_bigger(decimals,args[i]->decimals);
cached_result_type=item_store_type(cached_result_type,
args[i]->result_type());
}
if (cached_result_type == STRING_RESULT)
agg_arg_collations(collation, args, arg_count);
else if (cached_result_type != REAL_RESULT)
decimals= 0;
}
/****************************************************************************
......
sql/item_func.cc
View file @ b478c41d
......@@ -1170,32 +1170,32 @@ longlong Item_func_field::val_int()
if (cmp_type == STRING_RESULT)
{
String *field;
if (!(field=item->val_str(&value)))
if (!(field=args[0]->val_str(&value)))
return 0; // -1 if null ?
for (uint i=0 ; i < arg_count ; i++)
for (uint i=1 ; i < arg_count ; i++)
{
String *tmp_value=args[i]->val_str(&tmp);
if (tmp_value && field->length() == tmp_value->length() &&
!sortcmp(field,tmp_value,cmp_collation.collation))
return (longlong) (i+1);
return (longlong) (i);
}
}
else if (cmp_type == INT_RESULT)
{
longlong val= item->val_int();
for (uint i=0; i < arg_count ; i++)
longlong val= args[0]->val_int();
for (uint i=1; i < arg_count ; i++)
{
if (val == args[i]->val_int())
return (longlong) (i+1);
return (longlong) (i);
}
}
else
{
double val= item->val();
for (uint i=0; i < arg_count ; i++)
double val= args[0]->val();
for (uint i=1; i < arg_count ; i++)
{
if (val == args[i]->val())
return (longlong) (i+1);
return (longlong) (i);
}
}
return 0;
......@@ -1204,42 +1204,11 @@ longlong Item_func_field::val_int()
void Item_func_field::fix_length_and_dec()
{
maybe_null=0; max_length=3;
used_tables_cache|= item->used_tables();
const_item_cache&= item->const_item();
with_sum_func= with_sum_func || item->with_sum_func;
cmp_type= item->result_type();
for (uint i=0; i < arg_count ; i++)
cmp_type= args[0]->result_type();
for (uint i=1; i < arg_count ; i++)
cmp_type= item_cmp_type(cmp_type, args[i]->result_type());
if (cmp_type == STRING_RESULT)
{
cmp_collation.set(item->collation);
for (uint i=0 ; i < arg_count ; i++)
{
if (cmp_collation.aggregate(args[i]->collation))
{
my_error(ER_CANT_AGGREGATE_NCOLLATIONS,MYF(0),func_name());
return;
}
}
}
}
void Item_func_field::split_sum_func(Item **ref_pointer_array,
List<Item> &fields)
{
if (item->with_sum_func && item->type() != SUM_FUNC_ITEM)
item->split_sum_func(ref_pointer_array, fields);
else if (item->used_tables() || item->type() == SUM_FUNC_ITEM)
{
uint el= fields.elements;
fields.push_front(item);
ref_pointer_array[el]= item;
item= new Item_ref(ref_pointer_array + el, 0, item->name);
}
Item_func::split_sum_func(ref_pointer_array, fields);
agg_arg_collations_for_comparison(cmp_collation, args, arg_count);
}
......
sql/item_func.h
View file @ b478c41d
......@@ -625,33 +625,14 @@ public:
class Item_func_field :public Item_int_func
{
Item *item;
String value,tmp;
Item_result cmp_type;
DTCollation cmp_collation;
public:
Item_func_field(Item *a,List<Item> &list) :Item_int_func(list),item(a) {}
~Item_func_field() { delete item; }
Item_func_field(List<Item> &list) :Item_int_func(list) {}
longlong val_int();
bool fix_fields(THD *thd,struct st_table_list *tlist, Item **ref)
{
return (item->fix_fields(thd, tlist, &item) || item->check_cols(1) ||
Item_func::fix_fields(thd, tlist, ref));
}
void split_sum_func(Item **ref_pointer_array, List<Item> &fields);
void update_used_tables()
{
item->update_used_tables() ; Item_func::update_used_tables();
used_tables_cache|= item->used_tables();
const_item_cache&= item->const_item();
}
const char *func_name() const { return "field"; }
void fix_length_and_dec();
void set_outer_resolving()
{
item->set_outer_resolving();
Item_int_func::set_outer_resolving();
}
};
......
sql/item_strfunc.cc
View file @ b478c41d
......@@ -979,13 +979,14 @@ void Item_func_right::fix_length_and_dec()
String *Item_func_substr::val_str(String *str)
{
String *res = args[0]->val_str(str);
int32 start = (int32) args[1]->val_int()-1;
int32 start = (int32) args[1]->val_int();
int32 length = arg_count == 3 ? (int32) args[2]->val_int() : INT_MAX32;
int32 tmp_length;
if ((null_value=(args[0]->null_value || args[1]->null_value ||
(arg_count == 3 && args[2]->null_value))))
return 0; /* purecov: inspected */
start= (int32)((start < 0) ? res->length() + start : start -1);
start=res->charpos(start);
length=res->charpos(length,start);
if (start < 0 || (uint) start+1 > res->length() || length <= 0)
......
sql/item_timefunc.cc
View file @ b478c41d
......@@ -380,7 +380,7 @@ longlong Item_func_time_to_sec::val_int()
static bool get_interval_value(Item *args,interval_type int_type,
String *str_value, INTERVAL *t)
{
long array[4],value;
long array[5],value;
const char *str;
uint32 length;
LINT_INIT(value); LINT_INIT(str); LINT_INIT(length);
......
sql/lex.h
View file @ b478c41d
......@@ -627,6 +627,7 @@ static SYMBOL sql_functions[] = {
{ "STD", SYM(STD_SYM),0,0},
{ "STDDEV", SYM(STD_SYM),0,0},
{ "STRCMP", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_strcmp)},
{ "SUBSTR", SYM(SUBSTRING),0,0},
{ "SUBSTRING", SYM(SUBSTRING),0,0},
{ "SUBSTRING_INDEX", SYM(SUBSTRING_INDEX),0,0},
{ "SUBTIME", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_subtime)},
......
sql/share/czech/errmsg.txt
View file @ b478c41d
......@@ -16,7 +16,7 @@ v/*
"ANO",
"Nemohu vytvo-Bit soubor '%-.64s' (chybov kd: %d)",
"Nemohu vytvo-Bit tabulku '%-.64s' (chybov kd: %d)",
"Nemohu vytvo-Bit databzi '%-.64s', chyba %d",
"Nemohu vytvo-Bit databzi '%-.64s' (chybov kd: %d)",
"Nemohu vytvo-Bit databzi '%-.64s'; databze ji existuje",
"Nemohu zru-Bit databzi '%-.64s', databze neexistuje",
"Chyba p-Bi ruen databze (nemohu vymazat '%-.64s', chyba %d)",
......@@ -222,7 +222,7 @@ v/*
"CREATE DATABASE not allowed while thread is holding global read lock",
"Wrong arguments to %s",
"%-.32s@%-.64s is not allowed to create new users",
"Incorrect table definition; All MERGE tables must be in the same database",
"Incorrect table definition; all MERGE tables must be in the same database",
"Deadlock found when trying to get lock; Try restarting transaction",
"The used table type doesn't support FULLTEXT indexes",
"Cannot add foreign key constraint",
......
sql/share/danish/errmsg.txt
View file @ b478c41d
......@@ -10,7 +10,7 @@
"JA",
"Kan ikke oprette filen '%-.64s' (Fejlkode: %d)",
"Kan ikke oprette tabellen '%-.64s' (Fejlkode: %d)",
"Kan ikke oprette databasen '%-.64s'. Fejl %d",
"Kan ikke oprette databasen '%-.64s' (Fejlkode: %d)",
"Kan ikke oprette databasen '%-.64s'; databasen eksisterer",
"Kan ikke slette (droppe) '%-.64s'; databasen eksisterer ikke",
"Fejl ved sletning (drop) af databasen (kan ikke slette '%-.64s', Fejl %d)",
......@@ -216,7 +216,7 @@
"CREATE DATABASE er ikke tilladt mens en tråd holder på globalt read lock",
"Wrong arguments to %s",
"%-.32s@%-.64s is not allowed to create new users",
"Incorrect table definition; All MERGE tables must be in the same database",
"Incorrect table definition; all MERGE tables must be in the same database",
"Deadlock found when trying to get lock; Try restarting transaction",
"The used table type doesn't support FULLTEXT indexes",
"Cannot add foreign key constraint",
......
sql/share/dutch/errmsg.txt
View file @ b478c41d
......@@ -224,7 +224,7 @@
"CREATE DATABASE niet toegestaan terwijl thread een globale 'read lock' bezit",
"Foutieve parameters voor %s",
"%-.32s@%-.64s mag geen nieuwe gebruikers creeren",
"Incorrecte tabel definitie; Alle MERGE tabellen moeten tot dezelfde database behoren",
"Incorrecte tabel definitie; alle MERGE tabellen moeten tot dezelfde database behoren",
"Deadlock gevonden tijdens lock-aanvraag poging; Probeer herstart van de transactie",
"Het gebruikte tabel type ondersteund geen FULLTEXT indexen",
"Kan foreign key beperking niet toevoegen",
......
sql/share/english/errmsg.txt
View file @ b478c41d
......@@ -7,7 +7,7 @@
"YES",
"Can't create file '%-.64s' (errno: %d)",
"Can't create table '%-.64s' (errno: %d)",
"Can't create database '%-.64s'. (errno: %d)",
"Can't create database '%-.64s' (errno: %d)",
"Can't create database '%-.64s'; database exists",
"Can't drop database '%-.64s'; database doesn't exist",
"Error dropping database (can't delete '%-.64s', errno: %d)",
......@@ -213,7 +213,7 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Wrong arguments to %s",
"%-.32s@%-.64s is not allowed to create new users",
"Incorrect table definition; All MERGE tables must be in the same database",
"Incorrect table definition; all MERGE tables must be in the same database",
"Deadlock found when trying to get lock; Try restarting transaction",
"The used table type doesn't support FULLTEXT indexes",
"Cannot add foreign key constraint",
......
sql/share/estonian/errmsg.txt
View file @ b478c41d
......@@ -12,7 +12,7 @@
"JAH",
"Ei suuda luua faili '%-.64s' (veakood: %d)",
"Ei suuda luua tabelit '%-.64s' (veakood: %d)",
"Ei suuda luua andmebaasi '%-.64s'. (veakood: %d)",
"Ei suuda luua andmebaasi '%-.64s' (veakood: %d)",
"Ei suuda luua andmebaasi '%-.64s': andmebaas juba eksisteerib",
"Ei suuda kustutada andmebaasi '%-.64s': andmebaasi ei eksisteeri",
"Viga andmebaasi kustutamisel (ei suuda kustutada faili '%-.64s', veakood: %d)",
......
sql/share/french/errmsg.txt
View file @ b478c41d
......@@ -7,7 +7,7 @@
"OUI",
"Ne peut créer le fichier '%-.64s' (Errcode: %d)",
"Ne peut créer la table '%-.64s' (Errcode: %d)",
"Ne peut créer la base '%-.64s'. Erreur %d",
"Ne peut créer la base '%-.64s' (Erreur %d)",
"Ne peut créer la base '%-.64s'; elle existe déjà",
"Ne peut effacer la base '%-.64s'; elle n'existe pas",
"Ne peut effacer la base '%-.64s' (erreur %d)",
......@@ -213,7 +213,7 @@
"CREATE DATABASE n'est pas autorisée pendant qu'une tâche possède un verrou global en lecture",
"Mauvais arguments à %s",
"%-.32s@%-.64s n'est pas autorisé à créer de nouveaux utilisateurs",
"Définition de table incorrecte : toutes les tables MERGE doivent être dans la même base de donnée",
"Définition de table incorrecte; toutes les tables MERGE doivent être dans la même base de donnée",
"Deadlock découvert en essayant d'obtenir les verrous : essayez de redémarrer la transaction",
"Le type de table utilisé ne supporte pas les index FULLTEXT",
"Impossible d'ajouter des contraintes d'index externe",
......
sql/share/german/errmsg.txt
View file @ b478c41d
......@@ -14,9 +14,9 @@
"isamchk",
"Nein",
"Ja",
"Kann Datei '%-.64s' nicht erzeugen. (Fehler: %d)",
"Kann Tabelle '%-.64s' nicht erzeugen. (Fehler: %d)",
"Kann Datenbank '%-.64s' nicht erzeugen. (Fehler: %d)",
"Kann Datei '%-.64s' nicht erzeugen (Fehler: %d)",
"Kann Tabelle '%-.64s' nicht erzeugen (Fehler: %d)",
"Kann Datenbank '%-.64s' nicht erzeugen (Fehler: %d)",
"Kann Datenbank '%-.64s' nicht erzeugen; datenbank '%-.64s' existiert bereits.",
"Kann Datenbank '%-.64s' nicht löschen; keine Datenbank '%-.64s' vorhanden.",
"Fehler beim Löschen der Datenbank. ('%-.64s' kann nicht gelöscht werden, Fehlernuumer: %d)",
......@@ -222,7 +222,7 @@
"Solange ein globaler Read LOCK gesetzt ist, ist CREATE DATABASE nicht zulässig.",
"Falsche Argumente für %s",
"%-.32s@%-.64s is nicht berechtigt neue Benutzer hinzuzufügen.",
"Falsche Tabellendefinition: Sämtliche MERGE-Tabellen müssen in derselben Datenbank sein.",
"Falsche Tabellendefinition; sämtliche MERGE-Tabellen müssen in derselben Datenbank sein.",
"Beim Versuch einen Lock anzufordern ist ein Deadlock aufgetreten. Es wird versucht die Transaktion erneut zu starten.",
"Der verwendete Tabellentyp unterstützt keinen FULLTEXT-Index.",
"Foreign_Key Beschränkung konnte nicht hinzugefügt werden.",
......
sql/share/greek/errmsg.txt
View file @ b478c41d
......@@ -7,8 +7,8 @@
"",
" '%-.64s' ( : %d)",
" '%-.64s' ( : %d)",
" '%-.64s'. ( : %d)",
" '%-.64s'. ",
" '%-.64s' ( : %d)",
" '%-.64s'; ",
" '%-.64s'. ",
" ( '%-.64s', : %d)",
" ( '%-.64s', : %d)",
......@@ -213,7 +213,7 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Wrong arguments to %s",
"%-.32s@%-.64s is not allowed to create new users",
"Incorrect table definition; All MERGE tables must be in the same database",
"Incorrect table definition; all MERGE tables must be in the same database",
"Deadlock found when trying to get lock; Try restarting transaction",
"The used table type doesn't support FULLTEXT indexes",
"Cannot add foreign key constraint",
......
sql/share/hungarian/errmsg.txt
View file @ b478c41d
......@@ -215,7 +215,7 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Wrong arguments to %s",
"%-.32s@%-.64s is not allowed to create new users",
"Incorrect table definition; All MERGE tables must be in the same database",
"Incorrect table definition; all MERGE tables must be in the same database",
"Deadlock found when trying to get lock; Try restarting transaction",
"The used table type doesn't support FULLTEXT indexes",
"Cannot add foreign key constraint",
......
sql/share/italian/errmsg.txt
View file @ b478c41d
......@@ -7,7 +7,7 @@
"SI",
"Impossibile creare il file '%-.64s' (errno: %d)",
"Impossibile creare la tabella '%-.64s' (errno: %d)",
"Impossibile creare il database '%-.64s'. (errno: %d)",
"Impossibile creare il database '%-.64s' (errno: %d)",
"Impossibile creare il database '%-.64s'; il database esiste",
"Impossibile cancellare '%-.64s'; il database non esiste",
"Errore durante la cancellazione del database (impossibile cancellare '%-.64s', errno: %d)",
......
sql/share/japanese/errmsg.txt
View file @ b478c41d
......@@ -215,7 +215,7 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Wrong arguments to %s",
"%-.32s@%-.64s is not allowed to create new users",
"Incorrect table definition; All MERGE tables must be in the same database",
"Incorrect table definition; all MERGE tables must be in the same database",
"Deadlock found when trying to get lock; Try restarting transaction",
"The used table type doesn't support FULLTEXT indexes",
"Cannot add foreign key constraint",
......
sql/share/korean/errmsg.txt
View file @ b478c41d
......@@ -213,7 +213,7 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Wrong arguments to %s",
"%-.32s@%-.64s is not allowed to create new users",
"Incorrect table definition; All MERGE tables must be in the same database",
"Incorrect table definition; all MERGE tables must be in the same database",
"Deadlock found when trying to get lock; Try restarting transaction",
"The used table type doesn't support FULLTEXT indexes",
"Cannot add foreign key constraint",
......
sql/share/norwegian-ny/errmsg.txt
View file @ b478c41d
......@@ -9,7 +9,7 @@
"JA",
"Kan ikkje opprette fila '%-.64s' (Feilkode: %d)",
"Kan ikkje opprette tabellen '%-.64s' (Feilkode: %d)",
"Kan ikkje opprette databasen '%-.64s'. Feil %d",
"Kan ikkje opprette databasen '%-.64s' (Feilkode: %d)",
"Kan ikkje opprette databasen '%-.64s'; databasen eksisterer",
"Kan ikkje fjerne (drop) '%-.64s'; databasen eksisterer ikkje",
"Feil ved fjerning (drop) av databasen (kan ikkje slette '%-.64s', feil %d)",
......@@ -215,7 +215,7 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Wrong arguments to %s",
"%-.32s@%-.64s is not allowed to create new users",
"Incorrect table definition; All MERGE tables must be in the same database",
"Incorrect table definition; all MERGE tables must be in the same database",
"Deadlock found when trying to get lock; Try restarting transaction",
"The used table type doesn't support FULLTEXT indexes",
"Cannot add foreign key constraint",
......
sql/share/norwegian/errmsg.txt
View file @ b478c41d
......@@ -9,7 +9,7 @@
"JA",
"Kan ikke opprette fila '%-.64s' (Feilkode: %d)",
"Kan ikke opprette tabellen '%-.64s' (Feilkode: %d)",
"Kan ikke opprette databasen '%-.64s'. Feil %d",
"Kan ikke opprette databasen '%-.64s' (Feilkode: %d)",
"Kan ikke opprette databasen '%-.64s'; databasen eksisterer",
"Kan ikke fjerne (drop) '%-.64s'; databasen eksisterer ikke",
"Feil ved fjerning (drop) av databasen (kan ikke slette '%-.64s', feil %d)",
......@@ -215,7 +215,7 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Wrong arguments to %s",
"%-.32s@%-.64s is not allowed to create new users",
"Incorrect table definition; All MERGE tables must be in the same database",
"Incorrect table definition; all MERGE tables must be in the same database",
"Deadlock found when trying to get lock; Try restarting transaction",
"The used table type doesn't support FULLTEXT indexes",
"Cannot add foreign key constraint",
......
sql/share/polish/errmsg.txt
View file @ b478c41d
......@@ -11,7 +11,7 @@
"TAK",
"Nie mona stworzy pliku '%-.64s' (Kod bdu: %d)",
"Nie mona stworzy tabeli '%-.64s' (Kod bdu: %d)",
"Nie mona stworzy bazy danych '%-.64s'. B?d %d",
"Nie mona stworzy bazy danych '%-.64s' (Kod bdu: %d)",
"Nie mona stworzy bazy danych '%-.64s'; baza danych ju istnieje",
"Nie mona usun? bazy danych '%-.64s'; baza danych nie istnieje",
"B?d podczas usuwania bazy danych (nie mona usun? '%-.64s', b?d %d)",
......@@ -217,7 +217,7 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Wrong arguments to %s",
"%-.32s@%-.64s is not allowed to create new users",
"Incorrect table definition; All MERGE tables must be in the same database",
"Incorrect table definition; all MERGE tables must be in the same database",
"Deadlock found when trying to get lock; Try restarting transaction",
"The used table type doesn't support FULLTEXT indexes",
"Cannot add foreign key constraint",
......
sql/share/romanian/errmsg.txt
View file @ b478c41d
......@@ -11,7 +11,7 @@
"DA",
"Nu pot sa creez fisierul '%-.64s' (Eroare: %d)",
"Nu pot sa creez tabla '%-.64s' (Eroare: %d)",
"Nu pot sa creez baza de date '%-.64s'. (Eroare: %d)",
"Nu pot sa creez baza de date '%-.64s' (Eroare: %d)",
"Nu pot sa creez baza de date '%-.64s'; baza de date exista deja",
"Nu pot sa drop baza de date '%-.64s'; baza da date este inexistenta",
"Eroare dropuind baza de date (nu pot sa sterg '%-.64s', Eroare: %d)",
......@@ -217,7 +217,7 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Wrong arguments to %s",
"%-.32s@%-.64s is not allowed to create new users",
"Incorrect table definition; All MERGE tables must be in the same database",
"Incorrect table definition; all MERGE tables must be in the same database",
"Deadlock found when trying to get lock; Try restarting transaction",
"The used table type doesn't support FULLTEXT indexes",
"Cannot add foreign key constraint",
......
sql/share/russian/errmsg.txt
View file @ b478c41d
......@@ -9,7 +9,7 @@
"",
" '%-.64s' (: %d)",
" '%-.64s' (: %d)",
" '%-.64s'. (: %d)",
" '%-.64s' (: %d)",
" '%-.64s'. ",
" '%-.64s'. ",
" ( '%-.64s', : %d)",
......
sql/share/serbian/errmsg.txt
View file @ b478c41d
......@@ -13,7 +13,7 @@
"DA",
"Ne mogu da kreiram file '%-.64s' (errno: %d)",
"Ne mogu da kreiram tabelu '%-.64s' (errno: %d)",
"Ne mogu da kreiram bazu '%-.64s'. (errno: %d)",
"Ne mogu da kreiram bazu '%-.64s' (errno: %d)",
"Ne mogu da kreiram bazu '%-.64s'; baza ve postoji.",
"Ne mogu da izbriem bazu '%-.64s'; baza ne postoji.",
"Ne mogu da izbriem bazu (ne mogu da izbriem '%-.64s', errno: %d)",
......@@ -219,7 +219,7 @@
"Komanda 'CREATE DATABASE' nije dozvoljena dok thread globalno zakljuava itanje podataka",
"Pogreni argumenti prosleeni na %s",
"Korisniku %-.32s@%-.64s nije dozvoljeno da kreira nove korisnike",
"Pogrena definicija tabele; Sve 'MERGE' tabele moraju biti u istoj bazi podataka",
"Pogrena definicija tabele; sve 'MERGE' tabele moraju biti u istoj bazi podataka",
"Unakrsno zakljuavanje pronaeno kada sam pokuao da dobijem pravo na zakljuavanje; Probajte da restartujete transakciju",
"Upotrebljeni tip tabele ne podrava 'FULLTEXT' indekse",
"Ne mogu da dodam proveru spoljnog kljua",
......
sql/share/slovak/errmsg.txt
View file @ b478c41d
......@@ -15,7 +15,7 @@
"no",
"Nemem vytvori sbor '%-.64s' (chybov kd: %d)",
"Nemem vytvori tabuku '%-.64s' (chybov kd: %d)",
"Nemem vytvori databzu '%-.64s'. (chybov kd: %d)",
"Nemem vytvori databzu '%-.64s' (chybov kd: %d)",
"Nemem vytvori databzu '%-.64s'; databza existuje",
"Nemem zmaza databzu '%-.64s'; databza neexistuje",
"Chyba pri mazan databzy (nemem zmaza '%-.64s', chybov kd: %d)",
......@@ -221,7 +221,7 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Wrong arguments to %s",
"%-.32s@%-.64s is not allowed to create new users",
"Incorrect table definition; All MERGE tables must be in the same database",
"Incorrect table definition; all MERGE tables must be in the same database",
"Deadlock found when trying to get lock; Try restarting transaction",
"The used table type doesn't support FULLTEXT indexes",
"Cannot add foreign key constraint",
......
sql/share/spanish/errmsg.txt
View file @ b478c41d
......@@ -8,7 +8,7 @@
"SI",
"No puedo crear archivo '%-.64s' (Error: %d)",
"No puedo crear tabla '%-.64s' (Error: %d)",
"No puedo crear base de datos '%-.64s'. Error %d",
"No puedo crear base de datos '%-.64s' (Error: %d)",
"No puedo crear base de datos '%-.64s'; la base de datos ya existe",
"No puedo eliminar base de datos '%-.64s'; la base de datos no existe",
"Error eliminando la base de datos(no puedo borrar '%-.64s', error %d)",
......@@ -214,7 +214,7 @@
"CREATE DATABASE no permitido mientras un thread está ejerciendo un bloqueo de lectura global",
"Wrong arguments to %s",
"%-.32s@%-.64s is not allowed to create new users",
"Incorrect table definition; All MERGE tables must be in the same database",
"Incorrect table definition; all MERGE tables must be in the same database",
"Deadlock found when trying to get lock; Try restarting transaction",
"The used table type doesn't support FULLTEXT indexes",
"Cannot add foreign key constraint",
......
sql/share/swedish/errmsg.txt
View file @ b478c41d
......@@ -7,7 +7,7 @@
"YES",
"Kan inte skapa filen '%-.64s' (Felkod: %d)",
"Kan inte skapa tabellen '%-.64s' (Felkod: %d)",
"Kan inte skapa databasen '%-.64s'. (Felkod: %d)",
"Kan inte skapa databasen '%-.64s' (Felkod: %d)",
"Databasen '%-.64s' existerar redan",
"Kan inte radera databasen '%-.64s'; databasen finns inte",
"Fel vid radering av databasen (Kan inte radera '%-.64s'. Felkod: %d)",
......@@ -213,7 +213,7 @@
"CREATE DATABASE är inte tillåtet när man har ett globalt läslås",
"Felaktiga argument till %s",
"%-.32s@%-.64s har inte rättighet att skapa nya användare",
"Felaktig tabelldefinition. Alla tabeller i en MERGE-tabell måste vara i samma databas",
"Felaktig tabelldefinition; alla tabeller i en MERGE-tabell måste vara i samma databas",
"Fick 'DEADLOCK' vid låsförsök av block/rad. Försök att starta om transaktionen",
"Tabelltypen har inte hantering av FULLTEXT-index",
"Kan inte lägga till 'FOREIGN KEY constraint'",
......
sql/share/ukrainian/errmsg.txt
View file @ b478c41d
......@@ -12,7 +12,7 @@
"",
" '%-.64s' (: %d)",
" '%-.64s' (: %d)",
" '%-.64s'. (: %d)",
" '%-.64s' (: %d)",
" '%-.64s'. դ",
" '%-.64s'. դ",
" ( '%-.64s', : %d)",
......@@ -218,7 +218,7 @@
"CREATE DATABASE Ǧ Ц ",
" %s",
" %-.32s@%-.64s ަ",
"Incorrect table definition; All MERGE tables must be in the same database",
"Incorrect table definition; all MERGE tables must be in the same database",
"Deadlock found when trying to get lock; Try restarting transaction",
" æ Цդ FULLTEXT Ӧ",
"Cannot add foreign key constraint",
......
sql/sql_insert.cc
View file @ b478c41d
......@@ -404,13 +404,12 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
{
char buff[160];
if (duplic == DUP_IGNORE)
sprintf(buff,ER(ER_INSERT_INFO),info.records,
(lock_type == TL_WRITE_DELAYED) ? 0 :
info.records-info.copied,
thd->cuted_fields);
sprintf(buff, ER(ER_INSERT_INFO), (ulong) info.records,
(lock_type == TL_WRITE_DELAYED) ? (ulong) 0 :
(ulong) (info.records - info.copied), (ulong) thd->cuted_fields);
else
sprintf(buff,ER(ER_INSERT_INFO),info.records,info.deleted,
thd->cuted_fields);
sprintf(buff, ER(ER_INSERT_INFO), (ulong) info.records,
(ulong) info.deleted, (ulong) thd->cuted_fields);
::send_ok(thd,info.copied+info.deleted,(ulonglong)id,buff);
}
free_underlaid_joins(thd, &thd->lex.select_lex);
......@@ -1494,11 +1493,11 @@ bool select_insert::send_eof()
{
char buff[160];
if (info.handle_duplicates == DUP_IGNORE)
sprintf(buff,ER(ER_INSERT_INFO),info.records,info.records-info.copied,
thd->cuted_fields);
sprintf(buff, ER(ER_INSERT_INFO), (ulong) info.records,
(ulong) (info.records - info.copied), (ulong) thd->cuted_fields);
else
sprintf(buff,ER(ER_INSERT_INFO),info.records,info.deleted,
thd->cuted_fields);
sprintf(buff, ER(ER_INSERT_INFO), (ulong) info.records,
(ulong) info.deleted, (ulong) thd->cuted_fields);
::send_ok(thd,info.copied+info.deleted,last_insert_id,buff);
return 0;
}
......
sql/sql_load.cc
View file @ b478c41d
......@@ -318,8 +318,8 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
error= -1; // Error on read
goto err;
}
sprintf(name,ER(ER_LOAD_INFO),info.records,info.deleted,
info.records-info.copied,thd->cuted_fields);
sprintf(name, ER(ER_LOAD_INFO), (ulong) info.records, (ulong) info.deleted,
(ulong) (info.records - info.copied), (ulong) thd->cuted_fields);
send_ok(thd,info.copied+info.deleted,0L,name);
// on the slave thd->query is never initialized
if (!thd->slave_thread)
......
sql/sql_table.cc
View file @ b478c41d
......@@ -2416,8 +2416,8 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
query_cache_invalidate3(thd, table_list, 0);
end_temporary:
sprintf(tmp_name,ER(ER_INSERT_INFO),(ulong) (copied+deleted),
(ulong) deleted, thd->cuted_fields);
sprintf(tmp_name, ER(ER_INSERT_INFO), (ulong) (copied + deleted),
(ulong) deleted, (ulong) thd->cuted_fields);
send_ok(thd,copied+deleted,0L,tmp_name);
thd->some_tables_deleted=0;
DBUG_RETURN(0);
......
sql/sql_update.cc
View file @ b478c41d
......@@ -373,8 +373,8 @@ int mysql_update(THD *thd,
else
{
char buff[80];
sprintf(buff,ER(ER_UPDATE_INFO), (long) found, (long) updated,
(long) thd->cuted_fields);
sprintf(buff, ER(ER_UPDATE_INFO), (ulong) found, (ulong) updated,
(ulong) thd->cuted_fields);
send_ok(thd,
(thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated,
thd->insert_id_used ? thd->insert_id() : 0L,buff);
......@@ -993,8 +993,8 @@ bool multi_update::send_eof()
}
sprintf(buff,ER(ER_UPDATE_INFO), (long) found, (long) updated,
(long) thd->cuted_fields);
sprintf(buff, ER(ER_UPDATE_INFO), (ulong) found, (ulong) updated,
(ulong) thd->cuted_fields);
::send_ok(thd,
(thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated,
thd->insert_id_used ? thd->insert_id() : 0L,buff);
......
sql/sql_yacc.yy
View file @ b478c41d
......@@ -2427,7 +2427,7 @@ simple_expr:
$$= new Item_func_date_format (new Item_func_from_unixtime($3),$5,0);
}
| FIELD_FUNC '(' expr ',' expr_list ')'
{ $$= new Item_func_field($3, *$5); }
{ $5->push_front($3); $$= new Item_func_field(*$5); }
| GEOMFROMTEXT '(' expr ')'
{ $$= new Item_func_geometry_from_text($3); }
| GEOMFROMTEXT '(' expr ',' expr ')'
......
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