Commit ddb91478 authored by unknown's avatar unknown
Browse files

Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 

into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql


client/mysql.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/group_min_max.result:
  Auto merged
BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqld_ia64.dsp~7f8cf84d81ee04e2:
  Auto merged
BitKeeper/deleted/.del-mysqldump.dsp~a8bd23547d3fc27e:
  Auto merged
BitKeeper/deleted/.del-mysqldump_ia64.dsp~a2aabe898be35b31:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/group_min_max.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/time.cc:
  Auto merged
storage/ndb/test/ndbapi/Makefile.am:
  Auto merged
strings/decimal.c:
  Auto merged
mysql-test/r/analyse.result:
  Manual merge
mysql-test/r/bigint.result:
  Manual merge
mysql-test/r/create.result:
  Manual merge
mysql-test/r/information_schema.result:
  Manual merge
mysql-test/r/ps_2myisam.result:
  Manual merge
mysql-test/r/ps_3innodb.result:
  Manual merge
mysql-test/r/ps_4heap.result:
  Manual merge
mysql-test/r/ps_5merge.result:
  Manual merge
mysql-test/r/ps_6bdb.result:
  Manual merge
mysql-test/r/rpl_insert_id.result:
  Manual merge
mysql-test/r/select.result:
  Manual merge
mysql-test/r/sp.result:
  Manual merge
mysql-test/r/subselect.result:
  Manual merge
mysql-test/t/information_schema.test:
  Manual merge
mysql-test/t/rpl_insert_id.test:
  Manual merge
sql/field.h:
  Manual merge
sql/item.cc:
  Manual merge
sql/item.h:
  Manual merge
sql/item_strfunc.h:
  Manual merge
sql/item_sum.cc:
  Manual merge
sql/mysql_priv.h:
  Manual merge
sql/share/errmsg.txt:
  Manual merge
sql/sql_class.h:
  Manual merge
sql/sql_select.cc:
  Manual merge
parents fc466665 08be4e96

extra/yassl/yassl.dsp

+4 −4
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ RSC=rc.exe 
# PROP Output_Dir "Release"

# PROP Intermediate_Dir "Release"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

# ADD CPP /nologo /MT /W3 /O2 /I "include" /I "taocrypt\include" /I "mySTL" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "YASSL_PREFIX" /YX /FD /c

# ADD CPP /nologo /MT /W3 /O2 /I "include" /I "taocrypt\include" /I "mySTL" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "YASSL_PREFIX" /YX /FD /c

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"

BSC32=bscmake.exe
@@ -63,8 +63,8 @@ LIB32=link.exe -lib 
# PROP Output_Dir "Debug"

# PROP Intermediate_Dir "Debug"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "include" /I "taocrypt\include" /I "mySTL" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c

# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "YASSL_PREFIX" /YX /FD /GZ /c

# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "include" /I "taocrypt\include" /I "mySTL" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "YASSL_PREFIX" /FR /YX /FD /GZ /c

# ADD BASE RSC /l 0x409 /d "_DEBUG"

# ADD RSC /l 0x409 /d "_DEBUG"

BSC32=bscmake.exe

mysql-test/r/analyse.result

+12 −12
Original line number Diff line number Diff line
@@ -39,10 +39,10 @@ t2 CREATE TABLE `t2` ( 
  `Field_name` varbinary(255) NOT NULL DEFAULT '',

  `Min_value` varbinary(255) DEFAULT NULL,

  `Max_value` varbinary(255) DEFAULT NULL,

  `Min_length` bigint(11) NOT NULL DEFAULT '0',

  `Max_length` bigint(11) NOT NULL DEFAULT '0',

  `Empties_or_zeros` bigint(11) NOT NULL DEFAULT '0',

  `Nulls` bigint(11) NOT NULL DEFAULT '0',

  `Min_length` int(11) NOT NULL DEFAULT '0',

  `Max_length` int(11) NOT NULL DEFAULT '0',

  `Empties_or_zeros` int(11) NOT NULL DEFAULT '0',

  `Nulls` int(11) NOT NULL DEFAULT '0',

  `Avg_value_or_avg_length` varbinary(255) NOT NULL DEFAULT '',

  `Std` varbinary(255) DEFAULT NULL,

  `Optimal_fieldtype` varbinary(64) NOT NULL DEFAULT ''
@@ -58,10 +58,10 @@ t2 CREATE TABLE `t2` ( 
  `Field_name` varbinary(255) NOT NULL DEFAULT '',

  `Min_value` varbinary(255) DEFAULT NULL,

  `Max_value` varbinary(255) DEFAULT NULL,

  `Min_length` bigint(11) NOT NULL DEFAULT '0',

  `Max_length` bigint(11) NOT NULL DEFAULT '0',

  `Empties_or_zeros` bigint(11) NOT NULL DEFAULT '0',

  `Nulls` bigint(11) NOT NULL DEFAULT '0',

  `Min_length` int(11) NOT NULL DEFAULT '0',

  `Max_length` int(11) NOT NULL DEFAULT '0',

  `Empties_or_zeros` int(11) NOT NULL DEFAULT '0',

  `Nulls` int(11) NOT NULL DEFAULT '0',

  `Avg_value_or_avg_length` varbinary(255) NOT NULL DEFAULT '',

  `Std` varbinary(255) DEFAULT NULL,

  `Optimal_fieldtype` varbinary(64) NOT NULL DEFAULT ''
@@ -81,10 +81,10 @@ t2 CREATE TABLE `t2` ( 
  `Field_name` varbinary(255) NOT NULL DEFAULT '',

  `Min_value` varbinary(255) DEFAULT NULL,

  `Max_value` varbinary(255) DEFAULT NULL,

  `Min_length` bigint(11) NOT NULL DEFAULT '0',

  `Max_length` bigint(11) NOT NULL DEFAULT '0',

  `Empties_or_zeros` bigint(11) NOT NULL DEFAULT '0',

  `Nulls` bigint(11) NOT NULL DEFAULT '0',

  `Min_length` int(11) NOT NULL DEFAULT '0',

  `Max_length` int(11) NOT NULL DEFAULT '0',

  `Empties_or_zeros` int(11) NOT NULL DEFAULT '0',

  `Nulls` int(11) NOT NULL DEFAULT '0',

  `Avg_value_or_avg_length` varbinary(255) NOT NULL DEFAULT '',

  `Std` varbinary(255) DEFAULT NULL,

  `Optimal_fieldtype` varbinary(64) NOT NULL DEFAULT ''

mysql-test/r/bigint.result

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ create table t1 select 1 as 'a'; 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` bigint(1) NOT NULL DEFAULT '0'

  `a` int(1) NOT NULL DEFAULT '0'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

create table t1 select 9223372036854775809 as 'a';

mysql-test/r/create.result

+3 −3
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ t2 CREATE TABLE `t2` ( 
  `ifnull(h,h)` decimal(5,4) DEFAULT NULL,

  `ifnull(i,i)` year(4) DEFAULT NULL,

  `ifnull(j,j)` date DEFAULT NULL,

  `ifnull(k,k)` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',

  `ifnull(k,k)` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',

  `ifnull(l,l)` datetime DEFAULT NULL,

  `ifnull(m,m)` varchar(1) DEFAULT NULL,

  `ifnull(n,n)` varchar(3) DEFAULT NULL,
@@ -681,7 +681,7 @@ Table Create Table 
t1	CREATE TABLE `t1` (

  `b` int(11) NOT NULL,

  `a` varchar(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,

  `c` bigint(1) NOT NULL DEFAULT '0',

  `c` int(1) NOT NULL DEFAULT '0',

  PRIMARY KEY (`a`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;
@@ -694,7 +694,7 @@ Table Create Table 
t1	CREATE TABLE `t1` (

  `b` int(11) DEFAULT NULL,

  `a` varchar(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,

  `c` bigint(1) NOT NULL DEFAULT '0',

  `c` int(1) NOT NULL DEFAULT '0',

  PRIMARY KEY (`a`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

mysql-test/r/func_gconcat.result

+13 −0
Original line number Diff line number Diff line
@@ -647,3 +647,16 @@ select charset(group_concat(c1 order by c2)) from t1; 
charset(group_concat(c1 order by c2))

latin1

drop table t1;

CREATE TABLE t1 (a INT(10), b LONGTEXT, PRIMARY KEY (a));

SET GROUP_CONCAT_MAX_LEN = 20000000;

INSERT INTO t1 VALUES (1,REPEAT(CONCAT('A',CAST(CHAR(0) AS BINARY),'B'), 40000));

INSERT INTO t1 SELECT a + 1, b FROM t1;

SELECT a, CHAR_LENGTH(b) FROM t1;

a	CHAR_LENGTH(b)

1	120000

2	120000

SELECT CHAR_LENGTH( GROUP_CONCAT(b) ) FROM t1;

CHAR_LENGTH( GROUP_CONCAT(b) )

240001

SET GROUP_CONCAT_MAX_LEN = 1024;

DROP TABLE t1;