Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-02-23 17:36:50+01:00, msvensson@stripped +4 -0
Merge bk-internal:/home/bk/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
MERGE: 1.2417.1.4
extra/comp_err.c@stripped, 2007-02-23 17:36:46+01:00, msvensson@stripped +0 -120
Manual merge
MERGE: 1.25.1.1
mysql-test/t/mysql.test@stripped, 2007-02-23 17:35:59+01:00, msvensson@stripped +0 -0
Auto merged
MERGE: 1.25.1.1
mysql-test/t/mysqlbinlog.test@stripped, 2007-02-23 17:35:59+01:00, msvensson@stripped +0 -0
Auto merged
MERGE: 1.36.1.2
sql/share/errmsg.txt@stripped, 2007-02-23 17:36:00+01:00, msvensson@stripped +0 -540
Auto merged
MERGE: 1.76.1.1
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: msvensson
# Host: pilot.blaudden
# Root: /home/msvensson/mysql/mysql-5.0-maint/RESYNC
--- 1.26/extra/comp_err.c 2007-02-14 19:31:02 +01:00
+++ 1.27/extra/comp_err.c 2007-02-23 17:36:46 +01:00
@@ -637,27 +637,26 @@ static char checksum_format_specifier(co
{
char chksum= 0;
const char* p= msg;
- int is_format_specifier= 0;
+ const char* start= 0;
int num_format_specifiers= 0;
while (*p)
{
if (*p == '%')
{
- is_format_specifier= 1; /* Entering format specifier */
+ start= p+1; /* Entering format specifier */
num_format_specifiers++;
}
-
- if (is_format_specifier)
+ else if (start)
{
- chksum^= *p;
switch(*p)
{
case 'd':
case 'u':
case 'x':
case 's':
- is_format_specifier= 0; /* Not in format specifier anymore */
+ chksum= my_checksum(chksum, start, p-start);
+ start= 0; /* Not in format specifier anymore */
break;
default:
@@ -668,13 +667,13 @@ static char checksum_format_specifier(co
p++;
}
- if (is_format_specifier)
+ if (start)
{
/* Still inside a format specifier after end of string */
fprintf(stderr, "Still inside formatspecifier after end of string"
" in'%s'\n", msg);
- DBUG_ASSERT(is_format_specifier==0);
+ DBUG_ASSERT(start==0);
}
/* Add number of format specifiers to checksum as extra safeguard */
--- 1.77/sql/share/errmsg.txt 2007-02-19 12:50:34 +01:00
+++ 1.78/sql/share/errmsg.txt 2007-02-23 17:36:00 +01:00
@@ -1479,7 +1479,7 @@ ER_DUP_KEYNAME 42000 S1009
swe "Nyckelnamn '%-.64s' finns flera gånger"
ukr "äÕÂÌÀÀÞÅ ¦Í'Ñ ËÌÀÞÁ '%-.64s'"
ER_DUP_ENTRY 23000 S1009
- cze "Zvojen-Bý klíè '%-.64s' (èíslo klíèe %d)"
+ cze "Zdvojen-Bý klíè '%-.64s' (èíslo klíèe %d)"
dan "Ens værdier '%-.64s' for indeks %d"
nla "Dubbele ingang '%-.64s' voor zoeksleutel %d"
eng "Duplicate entry '%-.64s' for key %d"
--- 1.37/mysql-test/t/mysqlbinlog.test 2007-02-19 17:40:33 +01:00
+++ 1.38/mysql-test/t/mysqlbinlog.test 2007-02-23 17:35:59 +01:00
@@ -107,21 +107,6 @@ select "--- reading stdin --" as "";
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
--exec $MYSQL_BINLOG --short-form --position=79 - < $MYSQL_TEST_DIR/std_data/trunc_binlog.000001
-# Bug#16217 (mysql client did not know how not switch its internal charset)
-flush logs;
-create table t3 (f text character set utf8);
-create table t4 (f text character set cp932);
---exec $MYSQL --default-character-set=utf8 test -e "insert into t3 values(_utf8'ソ')"
---exec $MYSQL --default-character-set=cp932 test -e "insert into t4 values(_cp932'ƒ\');"
-flush logs;
-rename table t3 to t03, t4 to t04;
---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000004 | $MYSQL --default-character-set=utf8
-# original and recovered data must be equal
-select HEX(f) from t03;
-select HEX(f) from t3;
-select HEX(f) from t04;
-select HEX(f) from t4;
-
#
#BUG#14157: utf8 encoding in binlog without set character_set_client
#
@@ -139,7 +124,7 @@ EOF
# resulted binlog, parly consisting of multi-byte utf8 chars,
# must be digestable for both client and server. In 4.1 the client
# should use default-character-set same as the server.
---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000006 | $MYSQL
+--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000004 | $MYSQL
select * from t5 /* must be (1),(1) */;
#
@@ -158,7 +143,7 @@ insert into t5 values (3, date_format('2
select * from t5 order by c1;
flush logs;
drop table t5;
---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000007 | $MYSQL
+--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000005 | $MYSQL
select * from t5 order by c1;
#
# Bug#20396 Bin Log does not get DELIMETER cmd - Recover StoredProc fails
@@ -179,12 +164,12 @@ call p1();
drop procedure p1;
--error 1305
call p1();
---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000009
---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000009 | $MYSQL
+--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000007
+--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000007 | $MYSQL
call p1();
drop procedure p1;
# clean up
-drop table t1, t2, t03, t04, t3, t4, t5;
+drop table t1, t2, t5;
-# End of 5.0 tests
+--echo End of 5.0 tests
--- 1.28/mysql-test/t/mysql.test 2007-02-20 18:22:32 +01:00
+++ 1.29/mysql-test/t/mysql.test 2007-02-23 17:35:59 +01:00
@@ -44,20 +44,6 @@ unlock tables;
drop table t1;
#
-# BUG#16217 - MySQL client misinterpretes multi-byte char as escape `\'
-#
-
-# new command \C or charset
---exec $MYSQL --default-character-set=utf8 test -e "\C cp932 \g"
---exec $MYSQL --default-character-set=cp932 test -e "charset utf8;"
-
-# its usage to switch internally in mysql to requested charset
---exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ƒ\'; create table t1 (c_cp932 TEXT CHARACTER SET cp932); insert into t1 values('ƒ\'); select * from t1; drop table t1;"
---exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ƒ\'"
---exec $MYSQL --default-character-set=utf8 test -e "/*charset cp932 */; set character_set_client= cp932; select 'ƒ\'"
---exec $MYSQL --default-character-set=utf8 test -e "/*!\C cp932 */; set character_set_client= cp932; select 'ƒ\'"
-
-#
# Bug#16859 -- NULLs in columns must not truncate data as if a C-language "string".
#
--exec $MYSQL -t test -e "create table t1 (col1 binary(4), col2 varchar(10), col3 int); insert into t1 values ('a', 'b', 123421),('a ', '0123456789', 4), ('abcd', '', 4); select concat('>',col1,'<'), col2, col3 from t1; drop table t1;" 2>&1
| Thread |
|---|
| • bk commit into 5.0 tree (msvensson:1.2440) | msvensson | 23 Feb |
