Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
97b909d4
Commit
97b909d4
authored
21 years ago
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents
a32f4609
04ac36a4
Branches unavailable
Tags unavailable
No related merge requests found
Changes
36
Show whitespace changes
Inline
Side-by-side
Showing
36 changed files
with
208 additions
and
60 deletions
+208
-60
mysql-test/r/alter_table.result
mysql-test/r/alter_table.result
+39
-0
mysql-test/r/case.result
mysql-test/r/case.result
+21
-0
mysql-test/r/func_str.result
mysql-test/r/func_str.result
+21
-0
mysql-test/t/alter_table.test
mysql-test/t/alter_table.test
+27
-0
mysql-test/t/case.test
mysql-test/t/case.test
+22
-0
mysql-test/t/func_str.test
mysql-test/t/func_str.test
+11
-0
sql/item_cmpfunc.cc
sql/item_cmpfunc.cc
+6
-0
sql/item_strfunc.cc
sql/item_strfunc.cc
+2
-1
sql/item_timefunc.cc
sql/item_timefunc.cc
+1
-1
sql/lex.h
sql/lex.h
+1
-0
sql/share/czech/errmsg.txt
sql/share/czech/errmsg.txt
+2
-2
sql/share/danish/errmsg.txt
sql/share/danish/errmsg.txt
+2
-2
sql/share/dutch/errmsg.txt
sql/share/dutch/errmsg.txt
+1
-1
sql/share/english/errmsg.txt
sql/share/english/errmsg.txt
+2
-2
sql/share/estonian/errmsg.txt
sql/share/estonian/errmsg.txt
+1
-1
sql/share/french/errmsg.txt
sql/share/french/errmsg.txt
+2
-2
sql/share/german/errmsg.txt
sql/share/german/errmsg.txt
+4
-4
sql/share/greek/errmsg.txt
sql/share/greek/errmsg.txt
+3
-3
sql/share/hungarian/errmsg.txt
sql/share/hungarian/errmsg.txt
+1
-1
sql/share/italian/errmsg.txt
sql/share/italian/errmsg.txt
+1
-1
sql/share/japanese/errmsg.txt
sql/share/japanese/errmsg.txt
+1
-1
sql/share/korean/errmsg.txt
sql/share/korean/errmsg.txt
+1
-1
sql/share/norwegian-ny/errmsg.txt
sql/share/norwegian-ny/errmsg.txt
+2
-2
sql/share/norwegian/errmsg.txt
sql/share/norwegian/errmsg.txt
+2
-2
sql/share/polish/errmsg.txt
sql/share/polish/errmsg.txt
+2
-2
sql/share/romanian/errmsg.txt
sql/share/romanian/errmsg.txt
+2
-2
sql/share/russian/errmsg.txt
sql/share/russian/errmsg.txt
+1
-1
sql/share/serbian/errmsg.txt
sql/share/serbian/errmsg.txt
+2
-2
sql/share/slovak/errmsg.txt
sql/share/slovak/errmsg.txt
+2
-2
sql/share/spanish/errmsg.txt
sql/share/spanish/errmsg.txt
+2
-2
sql/share/swedish/errmsg.txt
sql/share/swedish/errmsg.txt
+2
-2
sql/share/ukrainian/errmsg.txt
sql/share/ukrainian/errmsg.txt
+2
-2
sql/sql_insert.cc
sql/sql_insert.cc
+9
-10
sql/sql_load.cc
sql/sql_load.cc
+2
-2
sql/sql_table.cc
sql/sql_table.cc
+2
-2
sql/sql_update.cc
sql/sql_update.cc
+4
-4
No files found.
mysql-test/r/alter_table.result
View file @
97b909d4
...
...
@@ -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;
This diff is collapsed.
Click to expand it.
mysql-test/r/case.result
View file @
97b909d4
...
...
@@ -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;
This diff is collapsed.
Click to expand it.
mysql-test/r/func_str.result
View file @
97b909d4
...
...
@@ -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)
This diff is collapsed.
Click to expand it.
mysql-test/t/alter_table.test
View file @
97b909d4
...
...
@@ -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
;
This diff is collapsed.
Click to expand it.
mysql-test/t/case.test
View file @
97b909d4
...
...
@@ -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
;
This diff is collapsed.
Click to expand it.
mysql-test/t/func_str.test
View file @
97b909d4
...
...
@@ -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
;
This diff is collapsed.
Click to expand it.
sql/item_cmpfunc.cc
View file @
97b909d4
...
...
@@ -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
;
}
/****************************************************************************
...
...
This diff is collapsed.
Click to expand it.
sql/item_strfunc.cc
View file @
97b909d4
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
sql/item_timefunc.cc
View file @
97b909d4
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
sql/lex.h
View file @
97b909d4
...
...
@@ -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
)},
...
...
This diff is collapsed.
Click to expand it.
sql/share/czech/errmsg.txt
View file @
97b909d4
...
...
@@ -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;
A
ll MERGE tables must be in the same database",
"Incorrect table definition;
a
ll 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",
...
...
This diff is collapsed.
Click to expand it.
sql/share/danish/errmsg.txt
View file @
97b909d4
...
...
@@ -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;
A
ll MERGE tables must be in the same database",
"Incorrect table definition;
a
ll 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",
...
...
This diff is collapsed.
Click to expand it.
sql/share/dutch/errmsg.txt
View file @
97b909d4
...
...
@@ -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;
A
lle MERGE tabellen moeten tot dezelfde database behoren",
"Incorrecte tabel definitie;
a
lle 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",
...
...
This diff is collapsed.
Click to expand it.
sql/share/english/errmsg.txt
View file @
97b909d4
...
...
@@ -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;
A
ll MERGE tables must be in the same database",
"Incorrect table definition;
a
ll 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",
...
...
This diff is collapsed.
Click to expand it.
sql/share/estonian/errmsg.txt
View file @
97b909d4
...
...
@@ -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)",
...
...
This diff is collapsed.
Click to expand it.
sql/share/french/errmsg.txt
View file @
97b909d4
...
...
@@ -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",
...
...
This diff is collapsed.
Click to expand it.
sql/share/german/errmsg.txt
View file @
97b909d4
...
...
@@ -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.",
...
...
This diff is collapsed.
Click to expand it.
sql/share/greek/errmsg.txt
View file @
97b909d4
...
...
@@ -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;
A
ll MERGE tables must be in the same database",
"Incorrect table definition;
a
ll 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",
...
...
This diff is collapsed.
Click to expand it.
sql/share/hungarian/errmsg.txt
View file @
97b909d4
...
...
@@ -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;
A
ll MERGE tables must be in the same database",
"Incorrect table definition;
a
ll 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",
...
...
This diff is collapsed.
Click to expand it.
sql/share/italian/errmsg.txt
View file @
97b909d4
...
...
@@ -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)",
...
...
This diff is collapsed.
Click to expand it.
sql/share/japanese/errmsg.txt
View file @
97b909d4
...
...
@@ -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;
A
ll MERGE tables must be in the same database",
"Incorrect table definition;
a
ll 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",
...
...
This diff is collapsed.
Click to expand it.
sql/share/korean/errmsg.txt
View file @
97b909d4
...
...
@@ -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;
A
ll MERGE tables must be in the same database",
"Incorrect table definition;
a
ll 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",
...
...
This diff is collapsed.
Click to expand it.
sql/share/norwegian-ny/errmsg.txt
View file @
97b909d4
...
...
@@ -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;
A
ll MERGE tables must be in the same database",
"Incorrect table definition;
a
ll 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",
...
...
This diff is collapsed.
Click to expand it.
sql/share/norwegian/errmsg.txt
View file @
97b909d4
...
...
@@ -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;
A
ll MERGE tables must be in the same database",
"Incorrect table definition;
a
ll 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",
...
...
This diff is collapsed.
Click to expand it.
sql/share/polish/errmsg.txt
View file @
97b909d4
...
...
@@ -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;
A
ll MERGE tables must be in the same database",
"Incorrect table definition;
a
ll 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",
...
...
This diff is collapsed.
Click to expand it.
sql/share/romanian/errmsg.txt
View file @
97b909d4
...
...
@@ -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;
A
ll MERGE tables must be in the same database",
"Incorrect table definition;
a
ll 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",
...
...
This diff is collapsed.
Click to expand it.
sql/share/russian/errmsg.txt
View file @
97b909d4
...
...
@@ -9,7 +9,7 @@
"",
" '%-.64s' (: %d)",
" '%-.64s' (: %d)",
" '%-.64s'
.
(: %d)",
" '%-.64s' (: %d)",
" '%-.64s'. ",
" '%-.64s'. ",
" ( '%-.64s', : %d)",
...
...
This diff is collapsed.
Click to expand it.
sql/share/serbian/errmsg.txt
View file @
97b909d4
...
...
@@ -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;
S
ve 'MERGE' tabele moraju biti u istoj bazi podataka",
"Pogrena definicija tabele;
s
ve '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",
...
...
This diff is collapsed.
Click to expand it.
sql/share/slovak/errmsg.txt
View file @
97b909d4
...
...
@@ -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;
A
ll MERGE tables must be in the same database",
"Incorrect table definition;
a
ll 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",
...
...
This diff is collapsed.
Click to expand it.
sql/share/spanish/errmsg.txt
View file @
97b909d4
...
...
@@ -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;
A
ll MERGE tables must be in the same database",
"Incorrect table definition;
a
ll 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",
...
...
This diff is collapsed.
Click to expand it.
sql/share/swedish/errmsg.txt
View file @
97b909d4
...
...
@@ -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
. A
lla tabeller i en MERGE-tabell måste vara i samma databas",
"Felaktig tabelldefinition
; a
lla 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'",
...
...
This diff is collapsed.
Click to expand it.
sql/share/ukrainian/errmsg.txt
View file @
97b909d4
...
...
@@ -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;
A
ll MERGE tables must be in the same database",
"Incorrect table definition;
a
ll MERGE tables must be in the same database",
"Deadlock found when trying to get lock; Try restarting transaction",
" æ Цդ FULLTEXT Ӧ",
"Cannot add foreign key constraint",
...
...
This diff is collapsed.
Click to expand it.
sql/sql_insert.cc
View file @
97b909d4
...
...
@@ -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
;
}
...
...
This diff is collapsed.
Click to expand it.
sql/sql_load.cc
View file @
97b909d4
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
sql/sql_table.cc
View file @
97b909d4
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
sql/sql_update.cc
View file @
97b909d4
...
...
@@ -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
,
(
u
long
)
updated
,
(
u
long
)
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
,
(
u
long
)
updated
,
(
u
long
)
thd
->
cuted_fields
);
::
send_ok
(
thd
,
(
thd
->
client_capabilities
&
CLIENT_FOUND_ROWS
)
?
found
:
updated
,
thd
->
insert_id_used
?
thd
->
insert_id
()
:
0L
,
buff
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment