Commit 3d6c1786 authored by unknown's avatar unknown

Update version number

Fixed serbian error messages
Fix for windows regarding changed variable name


configure.in:
  Update version number
  Added serbian error messages
libmysqld/libmysqld.def:
  Fix changed variable names
mysql-test/t/func_gconcat.test:
  remove some \r
sql/share/serbian/errmsg.txt:
  Added missing error messages
parent 42dae97f
...@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. ...@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(sql/mysqld.cc) AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line! # The Docs Makefile.am parses this line!
AM_INIT_AUTOMAKE(mysql, 4.1.2-alpha) AM_INIT_AUTOMAKE(mysql, 4.1.3-beta)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10 PROTOCOL_VERSION=10
...@@ -26,7 +26,7 @@ MYSQL_UNIX_ADDR_DEFAULT="/tmp/mysql.sock" ...@@ -26,7 +26,7 @@ MYSQL_UNIX_ADDR_DEFAULT="/tmp/mysql.sock"
AVAILABLE_LANGUAGES="\ AVAILABLE_LANGUAGES="\
czech danish dutch english estonian french german greek hungarian \ czech danish dutch english estonian french german greek hungarian \
italian japanese korean norwegian norwegian-ny polish portuguese \ italian japanese korean norwegian norwegian-ny polish portuguese \
romanian russian slovak spanish swedish ukrainian" romanian russian serbian slovak spanish swedish ukrainian"
# Generate make rules for all error messages # Generate make rules for all error messages
AVAILABLE_LANGUAGES_ERRORS= AVAILABLE_LANGUAGES_ERRORS=
......
...@@ -2,7 +2,8 @@ LIBRARY LIBMYSQLD ...@@ -2,7 +2,8 @@ LIBRARY LIBMYSQLD
DESCRIPTION 'MySQL 4.1 Embedded Server Library' DESCRIPTION 'MySQL 4.1 Embedded Server Library'
VERSION 4.1 VERSION 4.1
EXPORTS EXPORTS
_dig_vec _dig_vec_upper
_dig_vec_lower
bmove_upp bmove_upp
delete_dynamic delete_dynamic
free_defaults free_defaults
......
...@@ -83,7 +83,7 @@ insert into t1 values (4,'www.host.com'), (5,'www.google.com'),(5,'www.help.com' ...@@ -83,7 +83,7 @@ insert into t1 values (4,'www.host.com'), (5,'www.google.com'),(5,'www.help.com'
insert into t2 values (1,4), (5,4), (5,5); insert into t2 values (1,4), (5,4), (5,5);
# Make this order independent # Make this order independent
--replace_result www.help.com X www.host.com X www.google.com X --replace_result www.help.com X www.host.com X www.google.com X
select REQ_ID, Group_Concat(URL) as URL from t1, t2 where select REQ_ID, Group_Concat(URL) as URL from t1, t2 where
t2.URL_ID = t1.URL_ID group by REQ_ID; t2.URL_ID = t1.URL_ID group by REQ_ID;
# check min/max function # check min/max function
--replace_result www.help.com X www.host.com X www.google.com X --replace_result www.help.com X www.host.com X www.google.com X
...@@ -132,7 +132,7 @@ drop table t1, t2; ...@@ -132,7 +132,7 @@ drop table t1, t2;
CREATE TABLE t1 (id1 tinyint(4) NOT NULL, id2 tinyint(4) NOT NULL); CREATE TABLE t1 (id1 tinyint(4) NOT NULL, id2 tinyint(4) NOT NULL);
INSERT INTO t1 VALUES (1, 1),(1, 2),(1, 3),(1, 4),(1, 5),(2, 1),(2, 2),(2, 3); INSERT INTO t1 VALUES (1, 1),(1, 2),(1, 3),(1, 4),(1, 5),(2, 1),(2, 2),(2, 3);
CREATE TABLE t2 (id1 tinyint(4) NOT NULL); CREATE TABLE t2 (id1 tinyint(4) NOT NULL);
INSERT INTO t2 VALUES (1),(2),(3),(4),(5); INSERT INTO t2 VALUES (1),(2),(3),(4),(5);
SELECT t1.id1, GROUP_CONCAT(t1.id2 ORDER BY t1.id2 ASC) AS concat_id FROM t1, t2 WHERE t1.id1 = t2.id1 AND t1.id1=1 GROUP BY t1.id1; SELECT t1.id1, GROUP_CONCAT(t1.id2 ORDER BY t1.id2 ASC) AS concat_id FROM t1, t2 WHERE t1.id1 = t2.id1 AND t1.id1=1 GROUP BY t1.id1;
SELECT t1.id1, GROUP_CONCAT(t1.id2 ORDER BY t1.id2 ASC) AS concat_id FROM t1, t2 WHERE t1.id1 = t2.id1 GROUP BY t1.id1; SELECT t1.id1, GROUP_CONCAT(t1.id2 ORDER BY t1.id2 ASC) AS concat_id FROM t1, t2 WHERE t1.id1 = t2.id1 GROUP BY t1.id1;
...@@ -163,7 +163,7 @@ drop table t1; ...@@ -163,7 +163,7 @@ drop table t1;
# Test with subqueries (Bug #3319) # Test with subqueries (Bug #3319)
# #
create table t1 (a int, c int); create table t1 (a int, c int);
insert into t1 values (1, 2), (2, 3), (2, 4), (3, 5); insert into t1 values (1, 2), (2, 3), (2, 4), (3, 5);
create table t2 (a int, c int); create table t2 (a int, c int);
insert into t2 values (1, 5), (2, 4), (3, 3), (3,3); insert into t2 values (1, 5), (2, 4), (3, 3), (3,3);
......
...@@ -236,6 +236,18 @@ character-set=cp1250 ...@@ -236,6 +236,18 @@ character-set=cp1250
"Meanje tabela koje podravaju transakcije i onih koje ne podravaju transakcije je iskljueno", "Meanje tabela koje podravaju transakcije i onih koje ne podravaju transakcije je iskljueno",
"Opcija '%s' je upotrebljena dva puta u istom iskazu", "Opcija '%s' je upotrebljena dva puta u istom iskazu",
"User '%-.64s' has exceeded the '%s' resource (current value: %ld)", "User '%-.64s' has exceeded the '%s' resource (current value: %ld)",
"Access denied. You need the %-.128s privilege for this operation",
"Variable '%-.64s' is a SESSION variable and can't be used with SET GLOBAL",
"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL",
"Variable '%-.64s' doesn't have a default value",
"Variable '%-.64s' can't be set to the value of '%-.64s'",
"Wrong argument type to variable '%-.64s'",
"Variable '%-.64s' can only be set, not read",
"Wrong usage/placement of '%s'",
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
"Slave SQL thread ignored the query because of replicate-*-table rules",
"Variable '%-.64s' is a %s variable",
"Wrong foreign key definition for '%-.64s': %s", "Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match", "Key reference and table reference doesn't match",
"Operand should contain %d column(s)", "Operand should contain %d column(s)",
......
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