Below is the list of changes that have just been committed into a local
5.1 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, 2006-10-11 10:01:43+02:00, msvensson@neptunus.(none) +35 -0
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
MERGE: 1.1810.2078.30
BitKeeper/etc/collapsed@stripped, 2006-10-11 10:01:21+02:00, msvensson@neptunus.(none) +0 -2
auto-union
MERGE: 1.5.1.2
BitKeeper/etc/ignore@stripped, 2006-10-11 10:01:21+02:00, msvensson@neptunus.(none) +0 -0
auto-union
MERGE: 1.210.1.25
Makefile.am@stripped, 2006-10-11 10:01:26+02:00, msvensson@neptunus.(none) +0 -10
Auto merged
MERGE: 1.68.1.17
client/mysql.cc@stripped, 2006-10-11 10:01:26+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.199.1.22
configure.in@stripped, 2006-10-11 10:01:38+02:00, msvensson@neptunus.(none) +0 -2
MERGE: 1.245.1.154
include/m_ctype.h@stripped, 2006-10-11 10:01:26+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.114.1.7
include/my_global.h@stripped, 2006-10-11 10:01:26+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.96.1.32
mysql-test/lib/mtr_process.pl@stripped, 2006-10-11 10:01:27+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.25.2.11
mysql-test/mysql-test-run.pl@stripped, 2006-10-11 10:01:26+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.30.1.86
mysql-test/r/ctype_utf8.result@stripped, 2006-10-11 10:01:27+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.85.5.10
mysql-test/r/mysql.result@stripped, 2006-10-11 10:01:27+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.15.1.2
mysql-test/r/ps.result@stripped, 2006-10-11 10:01:27+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.56.1.20
mysql-test/r/strict.result@stripped, 2006-10-11 10:01:27+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.25.1.6
mysql-test/r/trigger.result@stripped, 2006-10-11 10:01:27+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.29.1.18
mysql-test/r/warnings.result@stripped, 2006-10-11 10:01:27+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.34.1.6
mysql-test/t/ctype_utf8.test@stripped, 2006-10-11 10:01:27+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.84.4.9
mysql-test/t/mysql.test@stripped, 2006-10-11 10:01:27+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.4.1.13
mysql-test/t/ps.test@stripped, 2006-10-11 10:01:27+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.56.1.16
mysql-test/t/trigger.test@stripped, 2006-10-11 10:01:27+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.34.1.19
sql/field.cc@stripped, 2006-10-11 10:01:27+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.256.1.70
sql/filesort.cc@stripped, 2006-10-11 10:01:27+02:00, msvensson@neptunus.(none) +0 -1
Auto merged
MERGE: 1.105.1.2
sql/item.cc@stripped, 2006-10-11 10:01:27+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.113.1.123
sql/item_func.cc@stripped, 2006-10-11 10:01:28+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.270.1.37
sql/item_func.h@stripped, 2006-10-11 10:01:28+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.136.2.18
sql/log.cc@stripped, 2006-10-11 10:01:28+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.158.1.38
sql/mysql_priv.h@stripped, 2006-10-11 10:01:28+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.290.1.125
sql/opt_range.cc@stripped, 2006-10-11 10:01:28+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.159.1.70
sql/opt_range.h@stripped, 2006-10-11 10:01:28+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.57.1.6
sql/set_var.cc@stripped, 2006-10-11 10:01:28+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.125.5.26
sql/sql_acl.cc@stripped, 2006-10-11 10:01:29+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.128.1.83
sql/sql_class.h@stripped, 2006-10-11 10:01:29+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.230.1.75
sql/sql_insert.cc@stripped, 2006-10-11 10:01:29+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.146.1.59
sql/sql_select.cc@stripped, 2006-10-11 10:01:29+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.312.1.150
sql/sql_show.cc@stripped, 2006-10-11 10:01:29+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.253.1.76
sql/sql_update.cc@stripped, 2006-10-11 10:01:30+02:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.154.2.46
# 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: neptunus.(none)
# Root: /home/msvensson/mysql/mysql-5.1/RESYNC
--- 1.126/include/m_ctype.h 2006-10-11 10:01:52 +02:00
+++ 1.127/include/m_ctype.h 2006-10-11 10:01:52 +02:00
@@ -196,7 +196,7 @@
/* Charset dependant snprintf() */
int (*snprintf)(struct charset_info_st *, char *to, uint n, const char *fmt,
- ...) ATTRIBUTE_FORMAT(printf, 4, 5);
+ ...) ATTRIBUTE_FORMAT_FPTR(printf, 4, 5);
int (*long10_to_str)(struct charset_info_st *, char *to, uint n, int radix,
long int val);
int (*longlong10_to_str)(struct charset_info_st *, char *to, uint n,
--- 1.366/sql/sql_show.cc 2006-10-11 10:01:52 +02:00
+++ 1.367/sql/sql_show.cc 2006-10-11 10:01:52 +02:00
@@ -5549,7 +5549,7 @@
ST_FIELD_INFO variables_fields_info[]=
{
{"Variable_name", 80, MYSQL_TYPE_STRING, 0, 0, "Variable_name"},
- {"Value", 255, MYSQL_TYPE_STRING, 0, 0, "Value"},
+ {"Value", FN_REFLEN, MYSQL_TYPE_STRING, 0, 0, "Value"},
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
};
--- 1.146/include/my_global.h 2006-10-11 10:01:52 +02:00
+++ 1.147/include/my_global.h 2006-10-11 10:01:52 +02:00
@@ -563,9 +563,6 @@
#ifndef __attribute__
# if !defined(__GNUC__)
# define __attribute__(A)
-# elif defined (__QNXNTO__)
- /* qcc defines GNUC */
-# define __attribute__(A)
# elif GCC_VERSION < 2008
# define __attribute__(A)
# elif defined(__cplusplus) && GCC_VERSION < 3004
@@ -580,6 +577,19 @@
*/
#ifndef ATTRIBUTE_FORMAT
# define ATTRIBUTE_FORMAT(style, m, n) __attribute__((format(style, m, n)))
+#endif
+
+/*
+
+ __attribute__((format(...))) on a function pointer is not supported
+ until gcc 3.1
+*/
+#ifndef ATTRIBUTE_FORMAT_FPTR
+# if (GCC_VERSION >= 3001)
+# define ATTRIBUTE_FORMAT_FPTR(style, m, n) ATTRIBUTE_FORMAT(style, m, n)
+# else
+# define ATTRIBUTE_FORMAT_FPTR(style, m, n)
+# endif /* GNUC >= 3.1 */
#endif
/*
--- 1.20/mysql-test/t/mysql.test 2006-10-11 10:01:52 +02:00
+++ 1.21/mysql-test/t/mysql.test 2006-10-11 10:01:52 +02:00
@@ -63,6 +63,12 @@
--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
#
+# Bug#17939 Wrong table format when using UTF8 strings
+#
+--exec $MYSQL --default-character-set=utf8 --table -e "SELECT 'John Doe' as '__tañgè Ñãmé'" 2>&1
+--exec $MYSQL --default-character-set=utf8 --table -e "SELECT '__tañgè Ñãmé' as 'John Doe'" 2>&1
+
+#
# Bug#18265 -- mysql client: No longer right-justifies numeric columns
#
--exec $MYSQL -t --default-character-set utf8 test -e "create table t1 (i int, j int, k char(25) charset utf8); insert into t1 (i) values (1); insert into t1 (k) values ('<----------------------->'); insert into t1 (k) values ('<-----'); insert into t1 (k) values ('Τη γλώσσα'); insert into t1 (k) values ('ᛖᚴ ᚷᛖᛏ'); select * from t1; DROP TABLE t1;"
| Thread |
|---|
| • bk commit into 5.1 tree (msvensson:1.2307) | msvensson | 11 Oct |
