database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge with 4.0 to get latest bug fixes

Browse Source
This commit is contained in:
monty@mysql.com
2004-09-04 15:59:49 +03:00
parent dfd310fc00 38f462ae6f
commit 9d8555c0f0
32 changed files with 431 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/r/merge.result
View File

@ -642,3 +642,12 @@ x y
1 3
1 2
drop table t1,t2,t3;
create table t1 (a int);
create table t2 (a int);
insert into t1 values (0);
insert into t2 values (1);
create table t3 engine=merge union=(t1, t2) select * from t1;
INSERT TABLE 't1' isn't allowed in FROM table list
create table t3 engine=merge union=(t1, t2) select * from t2;
INSERT TABLE 't2' isn't allowed in FROM table list
drop table t1, t2;

8
mysql-test/r/union.result
View File

@ -431,11 +431,19 @@ create table t1 select a from t1 union select a from t2;
ERROR HY000: You can't specify target table 't1' for update in FROM clause
select a from t1 union select a from t2 order by t2.a;
ERROR 42S02: Unknown table 't2' in order clause
drop table t1;
drop table t1,t2;
select length(version()) > 1 as `*` UNION select 2;
*
1
2
create table t1 (a int);
insert into t1 values (0), (3), (1), (2);
explain (select * from t1) union (select * from t1) order by a;
table type possible_keys key key_len ref rows Extra
t1 ALL NULL NULL NULL NULL 4
t1 ALL NULL NULL NULL NULL 4
drop table t1;
CREATE TABLE t1 ( id int(3) unsigned default '0') ENGINE=MyISAM;
INSERT INTO t1 (id) VALUES("1");
CREATE TABLE t2 ( id int(3) unsigned default '0', id_master int(5) default '0', text1 varchar(5) default NULL, text2 varchar(5) default NULL) ENGINE=MyISAM;

14
mysql-test/t/merge.test
View File

@ -271,3 +271,17 @@ select * from t3 where x = 1 and y < 5 order by y;
# Bug is that followng query returns empty set while it must be same as above
select * from t3 where x = 1 and y < 5 order by y desc;
drop table t1,t2,t3;
#
# Bug#5232: CREATE TABLE ... SELECT
#
create table t1 (a int);
create table t2 (a int);
insert into t1 values (0);
insert into t2 values (1);
--error 1093
create table t3 engine=merge union=(t1, t2) select * from t1;
--error 1093
create table t3 engine=merge union=(t1, t2) select * from t2;
drop table t1, t2;

9
mysql-test/t/union.test
View File

@ -256,6 +256,7 @@ drop temporary table t1;
create table t1 select a from t1 union select a from t2;
--error 1109
select a from t1 union select a from t2 order by t2.a;
drop table t1; # Drop temporary table
drop table t1,t2;
#
@ -264,6 +265,14 @@ drop table t1,t2;
select length(version()) > 1 as `*` UNION select 2;
#
# Bug #4980: problem with explain
#
create table t1 (a int);
insert into t1 values (0), (3), (1), (2);
explain (select * from t1) union (select * from t1) order by a;
drop table t1;
#
# Test for another bug with UNION and LEFT JOIN
#

15
scripts/mysqld_safe.sh
View File

@ -311,6 +311,7 @@ do
fi
if test ! -f $pid_file # This is removed if normal shutdown
then
echo "STOPPING server from pid file $pid_file"
break
fi
@ -321,12 +322,24 @@ do
# but should work for the rest of the servers.
# The only thing is ps x => redhat 5 gives warnings when using ps -x.
# kill -9 is used or the process won't react on the kill.
if test -n "$mysql_tcp_port"
then
numofproces=`ps xa | grep -v "grep" | grep $ledir/$MYSQLD| grep -c "port=$mysql_tcp_port"`
else
numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD`
fi
echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
I=1
while test "$I" -le "$numofproces"
do
PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | sed -n '$p'`
if test -n "$mysql_tcp_port"
then
PROC=`ps xa | grep "$ledir/$MYSQLD\>" | grep -v "grep" | grep "port=$mysql_tcp_port" | sed -n '$p'`
else
PROC=`ps xa | grep "$ledir/$MYSQLD\>" | grep -v "grep" | sed -n '$p'`
fi
for T in $PROC
do
break

5
sql/ha_innodb.cc
View File

@ -299,8 +299,9 @@ convert_error_code_to_mysql(
} else if (error == (int) DB_CANNOT_DROP_CONSTRAINT) {
return(HA_ERR_ROW_IS_REFERENCED);
return(HA_ERR_CANNOT_ADD_FOREIGN); /* TODO: This is a bit
misleading, a new MySQL error
code should be introduced */
} else if (error == (int) DB_COL_APPEARS_TWICE_IN_INDEX) {
return(HA_ERR_CRASHED);

7
sql/mysqld.cc
View File

@ -2940,6 +2940,13 @@ we force server id to 2, but this MySQL server will not act as a slave.");
#if defined(__NT__) || defined(HAVE_SMEM)
handle_connections_methods();
#else
#ifdef __WIN__
if ( !have_tcpip || opt_disable_networking)
{
sql_print_error("TCP/IP unavailable or disabled with --skip-networking; no available interfaces");
unireg_abort(1);
}
#endif
handle_connections_sockets(0);
#endif /* __NT__ */

16
sql/share/czech/errmsg.txt
View File

@ -1,3 +1,19 @@
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/*
Modifikoval Petr -B<>najdr, snajdr@pvt.net, snajdr@cpress.cz v.0.01
ISO LATIN-8852-2

17
sql/share/danish/errmsg.txt
View File

@ -1,5 +1,18 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind */
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* Knud Riish<73>jg<6A>rd knudriis@post.tele.dk 99 &&
Carsten H. Pedersen, carsten.pedersen@bitbybit.dk oct. 1999 / aug. 2001. */

18
sql/share/dutch/errmsg.txt
View File

@ -1,6 +1,20 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/*
Dutch error messages (share/dutch/errmsg.txt)
2001-08-02 - Arjen Lentz (agl@bitbike.com)
Completed earlier partial translation; worked on consistency and spelling.

17
sql/share/english/errmsg.txt
View File

@ -1,5 +1,18 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind */
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
character-set=latin1

19
sql/share/estonian/errmsg.txt
View File

@ -1,9 +1,22 @@
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/*
Copyright Abandoned 1997 MySQL AB
This file is public domain and comes with NO WARRANTY of any kind
Esialgne t<>lge: T<>nu Samuel (tonu@spam.ee)
Parandanud ja t<>iendanud: Indrek Siitan (tfr@mysql.com)
*/
character-set=latin7

17
sql/share/french/errmsg.txt
View File

@ -1,5 +1,18 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind */
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
character-set=latin1

20
sql/share/german/errmsg.txt
View File

@ -1,6 +1,20 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/*
Dirk Munzinger (dmun@4t2.com)
2001-06-07
@ -11,7 +25,7 @@
Stefan Hinz (stefan@mysql.com)
2003-10-01
*/
*/
character-set=latin1

17
sql/share/greek/errmsg.txt
View File

@ -1,5 +1,18 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind */
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
character-set=greek

20
sql/share/hungarian/errmsg.txt
View File

@ -1,7 +1,23 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/*
Translated by Feher Peter. Forditotta Feher Peter (feherp@mail.matav.hu) 1998
Updated May, 2000
This file is public domain and comes with NO WARRANTY of any kind */
*/
character-set=latin2

17
sql/share/italian/errmsg.txt
View File

@ -1,5 +1,18 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind */
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
character-set=latin1

19
sql/share/japanese/errmsg.txt
View File

@ -1,5 +1,20 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/*
3.22.10-beta euc-japanese (ujis) text
*/

17
sql/share/korean/errmsg.txt
View File

@ -1,5 +1,18 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This ȭ<><C8AD> is public domain and comes with NO WARRANTY of any kind */
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
character-set=euckr

17
sql/share/norwegian-ny/errmsg.txt
View File

@ -1,5 +1,18 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind */
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* Roy-Magne Mo rmo@www.hivolda.no 97 */

17
sql/share/norwegian/errmsg.txt
View File

@ -1,5 +1,18 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind */
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* Roy-Magne Mo rmo@www.hivolda.no 97 */

18
sql/share/polish/errmsg.txt
View File

@ -1,6 +1,20 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/*
Changed by Jaroslaw Lewandowski <jotel@itnet.com.pl>
Charset ISO-8859-2
*/

18
sql/share/portuguese/errmsg.txt
View File

@ -1,5 +1,19 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind */
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* Updated by Thiago Delgado Pinto - thiagodp@ieg.com.br - 06.07.2002 */
character-set=latin1

18
sql/share/romanian/errmsg.txt
View File

@ -1,6 +1,20 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/*
Translated into Romanian by Stefan Saroiu
e-mail: tzoompy@cs.washington.edu
*/

20
sql/share/russian/errmsg.txt
View File

@ -1,6 +1,22 @@
/* Copyright 2003 MySQL AB
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/*
Translation done in 2003 by Egor Egorov; Ensita.NET, http://www.ensita.net/
This file is public domain and comes with NO WARRANTY of any kind */
*/
/* charset: KOI8-R */
character-set=koi8r

17
sql/share/slovak/errmsg.txt
View File

@ -1,5 +1,18 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind */
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/*
Translated from both E n g l i s h & C z e c h error messages

19
sql/share/spanish/errmsg.txt
View File

@ -1,5 +1,20 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/*
Traduccion por Miguel Angel Fernandez Roiz -- LoboCom Sistemas, s.l.
From June 28, 2001 translated by Miguel Solorzano miguel@mysql.com */

221
sql/share/swedish/errmsg.OLD
View File

@ -1,221 +0,0 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind */
"hashchk",
"isamchk",
"NO",
"YES",
"Kan inte skapa filen: '%-.64s' (Felkod: %d)",
"Kan inte skapa tabellen: '%-.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)",
"Fel vid radering av databasen (Kan inte radera biblioteket '%-.64s'. Felkod: %d)",
"Kan inte radera filen: '%-.64s' (Felkod: %d)",
"Hittar inte posten i systemregistret",
"Kan inte l<>sa filinformationen (stat) fr<66>n '%-.64s' (Felkod: %d)",
"Kan inte inte l<>sa aktivt bibliotek. (Felkod: %d)",
"Kan inte l<>sa filen. (Felkod: %d)",
"Kan inte anv<6E>nda: '%-.64s'. (Felkod: %d)",
"Hittar inte filen: '%-.64s'. (Felkod: %d)",
"Kan inte l<>sa fr<66>n bibliotek '%-.64s'. (Felkod: %d)",
"Kan inte byta till: '%-.64s'. (Felkod: %d)",
"Posten har f<>r<EFBFBD>ndrats sedan den l<>stes i register '%-.64s'",
"Disken <20>r full (%s). V<>ntar tills det finns ledigt utrymme....",
"Kan inte skriva, dubbel s<>knyckel i register '%-.64s'",
"Fick fel vid st<73>ngning av '%-.64s' (Felkod: %d)",
"Fick fel vid l<>sning av '%-.64s' (Felkod %d)",
"Kan inte byta namn fr<66>n '%-.64s' till '%-.64s' (Felkod: %d)",
"Fick fel vid skrivning till '%-.64s' (Felkod %d)",
"'%-.64s' <20>r l<>st mot anv<6E>ndning",
"Sorteringen avbruten",
"Formul<75>r '%-.64s' finns inte i '%-.64s'",
"Fick felkod %d fr<66>n databashanteraren",
"Registrets databas har inte denna facilitet",
"Hittar inte posten",
"Felaktig fil: '%-.64s'",
"Fatalt fel vid hantering av register '%-.64s'. K<>r en reparation",
"Gammal nyckelfil '%-.64s'; Reparera registret",
"'%-.64s' <20>r skyddad mot f<>r<EFBFBD>ndring",
"Ov<4F>ntat slut p<> minnet, starta om programmet och f<>rs<72>k p<> nytt (Beh<65>vde %d bytes)",
"Sorteringsbufferten r<>cker inte till. Kontrollera startparametrarna",
"Ov<4F>ntat filslut vid l<>sning fr<66>n '%-.64s' (Felkod: %d)",
"F<>r m<>nga anslutningar",
"Fick slut p<> minnet. Kontrollera ifall mysqld eller n<>gon annan process anv<6E>nder allt tillg<6C>ngligt minne. Ifall inte, f<>rs<72>k anv<6E>nda 'ulimit' eller allokera mera swap",
"Kan inte hitta 'hostname' f<>r din adress",
"Fel vid initiering av kommunikationen med klienten",
"Anv<6E>ndare '%-.32s@%-.64s' <20>r ej ber<65>ttigad att anv<6E>nda databasen %-.64s",
"Anv<6E>ndare '%-.32s@%-.64s' <20>r ej ber<65>ttigad att logga in (Anv<6E>nder l<>sen: %s)",
"Ingen databas i anv<6E>ndning",
"Ok<4F>nt commando",
"Kolumn '%-.64s' f<>r inte vara NULL",
"Ok<4F>nd database '%-.64s'",
"Tabellen '%-.64s' finns redan",
"Ok<4F>nd tabell '%-.64s'",
"Kolumn: '%-.64s' i %s <20>r inte unik",
"Servern g<>r nu ned",
"Ok<4F>nd kolumn '%-.64s' i %s",
"'%-.64s' finns inte i GROUP BY",
"Kan inte anv<6E>nda GROUP BY med '%-.64s'",
"Kommandot har b<>de sum functions och enkla funktioner",
"Antalet kolumner motsvarar inte antalet v<>rden",
"Kolumn namn '%-.64s' <20>r f<>r l<>ngt",
"Kolumn namn '%-64s finns flera g<>nger",
"Nyckel namn '%-.64s' finns flera g<>nger",
"Dubbel nyckel '%-.64s' f<>r nyckel: %d",
"Felaktigt kolumn typ f<>r kolumn: '%-.64s'",
"%s n<>ra '%-.64s' p<> rad %d",
"Fr<46>gan var tom",
"Icke unikt tabell/alias: '%-.64s'",
"Ogiltigt DEFAULT v<>rde f<>r '%-.64s'",
"Flera PRIMARY KEY anv<6E>nda",
"F<>r m<>nga nycklar anv<6E>nda. Man f<>r ha h<>gst %d nycklar",
"F<>r m<>nga nyckel delar anv<6E>nda. Man f<>r ha h<>gst %d nyckeldelar",
"F<>r l<>ng nyckel. H<>gsta till<6C>tna nyckell<6C>ngd <20>r %d",
"Nyckel kolumn '%-.64s' finns inte",
"En BLOB '%-.64s' kan inte vara nyckel med den anv<6E>nda tabellen typen",
"F<>r stor kolumnl<6E>ngd angiven f<>r '%-.64s' (max= %d). Anv<6E>nd en BLOB inst<73>llet",
"Det f<>r finnas endast ett AUTO_INCREMENT f<>lt och detta m<>ste vara en nyckel",
"%s: klar att ta emot klienter\n",
"%s: Normal avslutning\n",
"%s: Fick signal %d. Avslutar!\n",
"%s: Avslutning klar\n",
"%s: St<53>nger av tr<74>d %ld anv<6E>ndare: '%-.64s'\n",
"Kan inte skapa IP socket",
"Tabellen '%-.64s' har inget index som motsvarar det angivna i CREATE INDEX. Skapa om tabellen",
"F<>lt separatorerna <20>r inte emots<74>gande eller f<>r l<>nga. Kontrollera mot manualen",
"Man kan inte anv<6E>nda fast radl<64>ngd med blobs. Anv<6E>nd 'fields terminated by'."
"Textfilen '%' m<>ste finnas i databas biblioteket eller vara l<>sbar f<>r alla",
"Filen '%-.64s' existerar redan",
"Rader: %ld Bortagna: %ld Dubletter: %ld Varningar: %ld",
"Rader: %ld Dubletter: %ld",
"Felaktig delnyckel. Nyckeldelen <20>r inte en str<74>ng eller den angivna l<>ngden <20>r l<>ngre <20>n kolumnl<6E>ngden",
"Man kan inte radera alla f<>lt med ALTER TABLE. Anv<6E>nd DROP TABLE ist<73>llet",
"Kan inte ta bort '%-.64s'. Kontrollera att f<>ltet/nyckel finns",
"Rader: %ld Dubletter: %ld Varningar: %ld",
"INSERT table '%-.64s' f<>r inte finnas i FROM tabell-listan",
"Finns inget thread med id %lu",
"Du <20>r inte <20>gare till thread %lu",
"Inga tabeller angivna",
"F<>r m<>nga alternativ till kolumn %s f<>r SET",
"Kan inte generera ett unikt filnamn %s.(1-999)\n",
"Tabell '%-.64s' kan inte uppdateras emedan den <20>r l<>st f<>r l<>sning",
"Tabell '%-.64s' <20>r inte l<>st med LOCK TABLES",
"BLOB f<>lt '%-.64s' kan inte ha ett DEFAULT v<>rde"
"Felaktigt databas namn '%-.64s'",
"Felaktigt tabell namn '%-.64s'",
"Den angivna fr<66>gan skulle troligen ta mycket long tid! Kontrollar din WHERE och anv<6E>nd SET OPTION SQL_BIG_SELECTS=1 ifall du vill hantera stora joins",
"Oidentifierat fel",
"Ok<4F>nd procedur: %s",
"Felaktigt antal parametrar till procedur %s",
"Felaktiga parametrar till procedur %s",
"Ok<4F>nd tabell '%-.64s' i '%-.64s'",
"F<>lt '%-.64s' <20>r redan anv<6E>nt",
"Felaktig anv<6E>ndning av SQL grupp function",
"Tabell '%-.64s' har en extension som inte finns i denna version av MySQL",
"Tabeller m<>ste ha minst 1 kolumn",
"Tabellen '%-.64s' <20>r full",
"Ok<4F>nt karakt<6B>rset: '%-.64s'",
"F<>r m<>nga tabeller. MySQL can ha h<>gst %d tabeller i en och samma join"
"F<>r m<>nga f<>lt",
"F<>r stor total rad l<>ngd. Den h<>gst till<6C>tna rad-l<>ngden, f<>rutom BLOBs, <20>r %d. <20>ndra n<>gra av dina f<>lt till BLOB",
"Tr<54>d-stacken tog slut: Har anv<6E>nt %ld av %ld bytes. Anv<6E>nd 'mysqld -O thread_stack=#' ifall du beh<65>ver en st<73>rre stack",
"Felaktigt referens i OUTER JOIN. Kontrollera ON uttrycket",
"Kolumn '%-.32s' <20>r anv<6E>nd med UNIQUE eller INDEX men <20>r inte definerad med NOT NULL",
"Kan inte ladda funktionen '%-.64s'",
"Kan inte initialisera funktionen '%-.64s'; '%-.80s'",
"Man f<>r inte ange s<>kv<6B>g f<>r dynamiska bibliotek",
"Funktionen '%-.64s' finns redan",
"Kan inte <20>ppna det dynamiska biblioteket '%-.64s' (Felkod: %d %s)",
"Hittar inte funktionen '%-.64s' in det dynamiska biblioteket",
"Funktionen '%-.64s' <20>r inte definierad",
"Denna dator '%-.64s' <20>r blockerad pga m<>nga felaktig paket. G<>r 'mysqladmin flush-hosts' f<>r att ta bort alla blockeringarna",
"Denna dator '%-.64s' har inte privileger att anv<6E>nda denna MySQL server",
"Du anv<6E>nder MySQL som en anonym anv<6E>ndare och som s<>dan f<>r du inte <20>ndra ditt l<>senord",
"F<>r att <20>ndra l<>senord f<>r andra m<>ste du ha r<>ttigheter att uppdatera mysql databasen",
"Hittade inte anv<6E>ndaren i 'user' tabellen",
"Rader: %ld Uppdaterade: %ld Varningar: %ld",
"Kan inte skapa en ny tr<74>d (errno %d)"
"Antalet kolumner motsvarar inte antalet v<>rden p<> rad: %ld",
"Kunde inte st<73>nga och <20>ppna tabell: '%-.64s',
"Felaktig anv<6E>nding av NULL",
"Fix fel '%-.64s' fr<66>n REGEXP",
"Man f<>r ha b<>de GROUP kolumner (MIN(),MAX(),COUNT()...) och f<>lt i en fr<66>ga om man inte har en GROUP BY del",
"Det finns inget privilegium definierat f<>r anv<6E>ndare '%-.32s' p<> '%-.64s'",
"%-.16s ej till<6C>tet f<>r '%-.32s@%-.64s' f<>r tabell '%-.64s'",
"%-.16s ej till<6C>tet f<>r '%-.32s@%-.64s'\n f<>r kolumn '%-.64s' i tabell '%-.64s'",
"Felaktigt GRANT privilegium anv<6E>nt",
"Felaktigt maskinnamn eller anv<6E>ndarnamn anv<6E>nt med GRANT",
"Det finns ingen tabell som heter '%-64s.%s'"
"Det finns inget privilegium definierat f<>r anv<6E>ndare '%-.32s' p<> '%-.64s' f<>r tabell '%-.64s'",
"Du kan inte anv<6E>nda detta kommando med denna MySQL version",
"Du har n<>got fel i din syntax",
"DELAYED INSERT tr<74>den kunde inte l<>sa tabell '%-.64s'",
"Det finns redan 'max_delayed_threads' tr<74>dar i anv<6E>nding",
"Avbr<62>t l<>nken f<>r tr<74>d %ld till db: '%-.64s' anv<6E>ndare: '%-.64s' (%s)",
"Kommunkationspaketet <20>r st<73>rre <20>n 'max_allowed_packet'",
"Fick l<>sfel fr<66>n klienten vid l<>sning fr<66>n 'PIPE'",
"Fick fatalt fel fr<66>n 'fcntl()'",
"Kommunikationspaketen kom i fel ordning",
"Kunde inte packa up kommunikationspaketet",
"Fick ett fel vid l<>sning fr<66>n klienten",
"Fick 'timeout' vid l<>sning fr<66>n klienten",
"Fick ett fel vid skrivning till klienten",
"Fick 'timeout' vid skrivning till klienten",
"Resultat str<74>ngen <20>r l<>ngre <20>n max_allowed_packet",
"Den anv<6E>nda tabell typen kan inte hantera BLOB/TEXT kolumner",
"Den anv<6E>nda tabell typen kan inte hantera AUTO_INCREMENT kolumner",
"INSERT DELAYED kan inte anv<6E>ndas med tabell '%-.64s', emedan den <20>r l<>st med LOCK TABLES",
"Felaktigt column namn '%-.100s'",
"Den anv<6E>nda tabell typen kan inte indexera kolumn '%-.64s'",
"Tabellerna i MERGE tabellen <20>r inte identiskt definierade",
"Kan inte skriva till tabell '%-.64s'; UNIQUE test",
"Du har inte angett en nyckel l<>ngd f<>r BLOB '%-.64s'",
"Alla delar av en PRIMARY KEY m<>ste vara NOT NULL; Om du vill ha en nyckel med NULL, anv<6E>nd UNIQUE ist<73>llet",
"Resultet bestod av mera <20>n en rad",
"Denna tabell typ kr<6B>ver en PRIMARY KEY",
"Denna version av MySQL <20>r inte kompilerad med RAID",
"Du anv<6E>nder 's<>ker uppdaterings mod' och f<>rs<72>kte uppdatera en table utan en WHERE sats som anv<6E>nder sig av en nyckel",
"Nyckel '%-.64s' finns inte in tabell '%-.64s'",
"Kan inte <20>ppna tabellen",
"Tabellhanteraren f<>r denna tabell kan inte g<>ra check/repair",
"Du f<>r inte utf<74>ra detta kommando i en transaktion",
"Fick fel %d vid COMMIT",
"Fick fel %d vid ROLLBACK",
"Fick fel %d vid FLUSH_LOGS",
"Fick fel %d vid CHECKPOINT",
"Avbr<62>t l<>nken f<>r tr<74>d %ld till db: '%-.64s' anv<6E>ndare: '%-.32s' Host: '%-.64s' (%.-64s)",
"Tabellhanteraren klarar inte en bin<69>r kopiering av tabellen",
"Bin<69>rloggen st<73>ngdes medan vi gjorde FLUSH MASTER",
"Failed rebuilding the index of dumped table '%-.64s'",
"Fick en master: '%-.64s'",
"Fick n<>tverksfel vid l<>sning fr<66>n master",
"Fick n<>tverksfel vid skrivning till master",
"Hittar inte ett FULLTEXT index i kolumnlistan",
"Kan inte exekvera kommandot emedan du har en l<>st tabell eller an aktiv transaktion",
"Ok<4F>nd system variabel '%-.64'",
"Tabell '%-.64s' <20>r crashad och b<>r repareras med REPAIR TABLE",
"Tabell '%-.64s' <20>r crashad och senast (automatiska?) reparation misslyckades",
"Warning: N<>gra icke transaktionella tabeller kunde inte <20>terst<73>llas vid ROLLBACK",
"Transaktionen kr<6B>vde mera <20>n 'max_binlog_cache_size' minne. Ut<55>ka denna mysqld variabel och f<>rs<72>k p<> nytt",
"Denna operation kan inte g<>ras under replikering; G<>r SLAVE STOP f<>rst",
"Denna operation kan endast g<>ras under replikering; Konfigurera slaven och g<>r SLAVE START",
"Servern <20>r inte konfigurerade som en replikations slav. <20>ndra konfigurationsfilen eller g<>r CHANGE MASTER TO",
"Kunde inte initializera replications-strukturerna. Kontrollera privilegerna f<>r 'master.info'",
"Kunde inte starta en tr<74>d f<>r replikering",
"Anv<6E>ndare '%-.64s' har redan 'max_user_connections' aktiva inloggningar",
"Man kan endast anv<6E>nda konstant-uttryck med SET",
"Fick inte ett l<>s i tid",
"Antal l<>s <20>verskrider antalet reserverade l<>s",
"Updaterings-l<>s kan inte g<>ras n<>r man anv<6E>nder READ UNCOMMITTED",
"DROP DATABASE <20>r inte till<6C>tet n<>r man har ett globalt l<>s-l<>s",
"CREATE DATABASE <20>r inte till<6C>tet n<>r man har ett globalt l<>s-l<>s",
"Felaktiga argument till %s",
"%-.32s@%-.64s har inte r<>ttigheter att skapa nya anv<6E>ndare",
"Fick fel vid anslutning till master: %-.128s",
"Fick fel vid utf<74>rande av command p<> mastern: %-.128s",
"Fick fel vid utf<74>rande av %s: %-.128s",
"Felaktig anv<6E>nding av %s and %s",
"SELECT kommandona har olika antal kolumner"
"Kan inte utf<74>ra kommandot emedan du har ett READ l<>s",

17
sql/share/swedish/errmsg.txt
View File

@ -1,5 +1,18 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind */
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
character-set=latin1

20
sql/share/ukrainian/errmsg.txt
View File

@ -1,6 +1,20 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
* This <20><><EFBFBD><EFBFBD> is public domain and comes with NO WARRANTY of any kind
*
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/*
* Ukrainian translation by Roman Festchook <roma@orta.zt.ua>
* Encoding: KOI8-U
* Version: 13/09/2001 mysql-3.23.41

15
sql/sql_parse.cc
View File

@ -2335,6 +2335,21 @@ mysql_execute_command(THD *thd)
net_printf(thd,ER_UPDATE_TABLE_USED, create_table->real_name);
goto create_error;
}
if (lex->create_info.used_fields & HA_CREATE_USED_UNION)
{
TABLE_LIST *tab;
for (tab= tables; tab; tab= tab->next)
{
if (find_real_table_in_list((TABLE_LIST*) lex->create_info.
merge_list.first,
tables->db, tab->real_name))
{
net_printf(thd, ER_UPDATE_TABLE_USED, tab->real_name);
goto create_error;
}
}
}
if (tables && check_table_access(thd, SELECT_ACL, tables,0))
goto create_error; // Error message is given
select_lex->options|= SELECT_NO_UNLOCK;

2
sql/sql_yacc.yy
View File

@ -4332,7 +4332,7 @@ show_param:
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_BINLOG_EVENTS;
} opt_limit_clause_init
| keys_or_index FROM table_ident opt_db
| keys_or_index from_or_in table_ident opt_db
{
Lex->sql_command= SQLCOM_SHOW_KEYS;
if ($4)