Commit 12e09c02 authored by unknown's avatar unknown

Merge bk-internal:/home/bk/mysql-5.1-rpl

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


sql/log.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
parents c34940a0 4bd33a0d
...@@ -196,7 +196,7 @@ typedef struct my_charset_handler_st ...@@ -196,7 +196,7 @@ typedef struct my_charset_handler_st
/* Charset dependant snprintf() */ /* Charset dependant snprintf() */
int (*snprintf)(struct charset_info_st *, char *to, uint n, const char *fmt, 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, int (*long10_to_str)(struct charset_info_st *, char *to, uint n, int radix,
long int val); long int val);
int (*longlong10_to_str)(struct charset_info_st *, char *to, uint n, int (*longlong10_to_str)(struct charset_info_st *, char *to, uint n,
......
...@@ -563,9 +563,6 @@ typedef unsigned short ushort; ...@@ -563,9 +563,6 @@ typedef unsigned short ushort;
#ifndef __attribute__ #ifndef __attribute__
# if !defined(__GNUC__) # if !defined(__GNUC__)
# define __attribute__(A) # define __attribute__(A)
# elif defined (__QNXNTO__)
/* qcc defines GNUC */
# define __attribute__(A)
# elif GCC_VERSION < 2008 # elif GCC_VERSION < 2008
# define __attribute__(A) # define __attribute__(A)
# elif defined(__cplusplus) && GCC_VERSION < 3004 # elif defined(__cplusplus) && GCC_VERSION < 3004
...@@ -582,6 +579,19 @@ typedef unsigned short ushort; ...@@ -582,6 +579,19 @@ typedef unsigned short ushort;
# define ATTRIBUTE_FORMAT(style, m, n) __attribute__((format(style, m, n))) # define ATTRIBUTE_FORMAT(style, m, n) __attribute__((format(style, m, n)))
#endif #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
/* /*
Wen using the embedded library, users might run into link problems, Wen using the embedded library, users might run into link problems,
duplicate declaration of __cxa_pure_virtual, solved by declaring it a duplicate declaration of __cxa_pure_virtual, solved by declaring it a
......
...@@ -76,6 +76,16 @@ c_cp932 ...@@ -76,6 +76,16 @@ c_cp932
| >a < | 0123456789 | 4 | | >a < | 0123456789 | 4 |
| >abcd< | | 4 | | >abcd< | | 4 |
+----------------------+------------+--------+ +----------------------+------------+--------+
+-------------------+
| __tañgè Ñãmé |
+-------------------+
| John Doe |
+-------------------+
+-------------------+
| John Doe |
+-------------------+
| __tañgè Ñãmé |
+-------------------+
+------+------+---------------------------+ +------+------+---------------------------+
| i | j | k | | i | j | k |
+------+------+---------------------------+ +------+------+---------------------------+
......
...@@ -62,6 +62,12 @@ drop table t1; ...@@ -62,6 +62,12 @@ drop table t1;
# #
--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 --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 # Bug#18265 -- mysql client: No longer right-justifies numeric columns
# #
......
...@@ -263,6 +263,7 @@ my $hc_locks = ""; ...@@ -263,6 +263,7 @@ my $hc_locks = "";
my $hc_tables = ""; my $hc_tables = "";
my $num_tables = 0; my $num_tables = 0;
my $num_files = 0; my $num_files = 0;
my $raid_dir_regex = '[A-Za-z0-9]{2}';
foreach my $rdb ( @db_desc ) { foreach my $rdb ( @db_desc ) {
my $db = $rdb->{src}; my $db = $rdb->{src};
...@@ -294,7 +295,7 @@ foreach my $rdb ( @db_desc ) { ...@@ -294,7 +295,7 @@ foreach my $rdb ( @db_desc ) {
my @raid_dir = (); my @raid_dir = ();
while ( defined( my $name = readdir DBDIR ) ) { while ( defined( my $name = readdir DBDIR ) ) {
if ( $name =~ /^\d\d$/ && -d "$db_dir/$name" ) { if ( $name =~ /^$raid_dir_regex$/ && -d "$db_dir/$name" ) {
push @raid_dir, $name; push @raid_dir, $name;
} }
else { else {
...@@ -602,7 +603,7 @@ sub copy_files { ...@@ -602,7 +603,7 @@ sub copy_files {
# add recursive option for scp # add recursive option for scp
$cp.= " -r" if $^O =~ /m^(solaris|linux|freebsd|darwin)$/ && $method =~ /^scp\b/; $cp.= " -r" if $^O =~ /m^(solaris|linux|freebsd|darwin)$/ && $method =~ /^scp\b/;
my @non_raid = map { "'$_'" } grep { ! m:/\d{2}/[^/]+$: } @$files; my @non_raid = map { "'$_'" } grep { ! m:/$raid_dir_regex/[^/]+$: } @$files;
# add files to copy and the destination directory # add files to copy and the destination directory
safe_system( $cp, @non_raid, "'$target'" ) if (@non_raid); safe_system( $cp, @non_raid, "'$target'" ) if (@non_raid);
...@@ -810,7 +811,7 @@ sub get_raid_dirs { ...@@ -810,7 +811,7 @@ sub get_raid_dirs {
my %dirs = (); my %dirs = ();
foreach my $f ( @$r_files ) { foreach my $f ( @$r_files ) {
if ( $f =~ m:^(\d\d)/: ) { if ( $f =~ m:^($raid_dir_regex)/: ) {
$dirs{$1} = 1; $dirs{$1} = 1;
} }
} }
......
...@@ -5549,7 +5549,7 @@ ST_FIELD_INFO partitions_fields_info[]= ...@@ -5549,7 +5549,7 @@ ST_FIELD_INFO partitions_fields_info[]=
ST_FIELD_INFO variables_fields_info[]= ST_FIELD_INFO variables_fields_info[]=
{ {
{"Variable_name", 80, MYSQL_TYPE_STRING, 0, 0, "Variable_name"}, {"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} {0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
}; };
......
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