Commit 15a1774e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-5.0-clean 

into  mysql.com:/home/jimw/my/mysql-5.1-clean


client/mysqldump.c:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/unireg.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Fix conflict
mysql-test/t/mysqldump.test:
  Fix conflict
parents 8705383a 025d8c14

client/mysqldump.c

+6 −5
Original line number Diff line number Diff line
@@ -2162,6 +2162,8 @@ static void dump_table(char *table, char *db) 
      for (i = 0; i < mysql_num_fields(res); i++)

      {

        int is_blob;

        ulong length= lengths[i];



	if (!(field = mysql_fetch_field(res)))

	{

	  my_snprintf(query, QUERY_LENGTH,
@@ -2188,7 +2190,6 @@ static void dump_table(char *table, char *db) 
                   field->type == MYSQL_TYPE_TINY_BLOB)) ? 1 : 0;

	if (extended_insert)

	{

	  ulong length = lengths[i];

	  if (i == 0)

	    dynstr_set(&extended_row,"(");

	  else
@@ -2278,19 +2279,19 @@ static void dump_table(char *table, char *db) 
	      {

	        print_xml_tag1(md_result_file, "\t\t", "field name=",

			      field->name, "");

		print_quoted_xml(md_result_file, row[i], lengths[i]);

		print_quoted_xml(md_result_file, row[i], length);

		fputs("</field>\n", md_result_file);

	      }

	      else if (opt_hex_blob && is_blob)

	      else if (opt_hex_blob && is_blob && length)

              {

                /* sakaik got the idea to to provide blob's in hex notation. */

                char *ptr= row[i], *end= ptr+ lengths[i];

                char *ptr= row[i], *end= ptr + length;

                fputs("0x", md_result_file);

                for (; ptr < end ; ptr++)

		  fprintf(md_result_file, "%02X", *((uchar *)ptr));

              }

              else

                unescape(md_result_file, row[i], lengths[i]);

                unescape(md_result_file, row[i], length);

	    }

	    else

	    {

mysql-test/r/bdb.result

+14 −0
Original line number Diff line number Diff line
@@ -1891,3 +1891,17 @@ t1 CREATE TABLE `t1` ( 
) ENGINE=BerkeleyDB DEFAULT CHARSET=latin1

drop table t1;

set storage_engine=MyISAM;

create table t1 (a varchar(255) character set utf8,

b varchar(255) character set utf8,

c varchar(255) character set utf8,

d varchar(255) character set utf8,

key (a,b,c,d)) engine=bdb;

drop table t1;

create table t1 (a varchar(255) character set utf8,

b varchar(255) character set utf8,

c varchar(255) character set utf8,

d varchar(255) character set utf8,

e varchar(255) character set utf8,

key (a,b,c,d,e)) engine=bdb;

ERROR 42000: Specified key was too long; max key length is 3072 bytes

End of 5.0 tests

mysql-test/r/func_equal.result

+9 −0
Original line number Diff line number Diff line
@@ -33,3 +33,12 @@ id value 
select * from t1 where id <=> value or value<=>id;

id	value

drop table t1,t2;

create table t1 (a bigint unsigned);

insert into t1 values (4828532208463511553);

select * from t1 where a = '4828532208463511553';

a

4828532208463511553

select * from t1 where a in ('4828532208463511553');

a

4828532208463511553

drop table t1;

mysql-test/r/innodb.result

+14 −0
Original line number Diff line number Diff line
@@ -2772,3 +2772,17 @@ insert into t2 values (4,_ucs2 0x05612020,_ucs2 0x05612020,'taken'); 
drop table t1;

drop table t2;

commit;

create table t1 (a varchar(255) character set utf8,

b varchar(255) character set utf8,

c varchar(255) character set utf8,

d varchar(255) character set utf8,

key (a,b,c,d)) engine=innodb;

drop table t1;

create table t1 (a varchar(255) character set utf8,

b varchar(255) character set utf8,

c varchar(255) character set utf8,

d varchar(255) character set utf8,

e varchar(255) character set utf8,

key (a,b,c,d,e)) engine=innodb;

ERROR 42000: Specified key was too long; max key length is 3072 bytes

End of 5.0 tests

mysql-test/r/mysqldump.result

+70 −0
Original line number Diff line number Diff line
@@ -1696,6 +1696,75 @@ test.t1: Records: 1 Deleted: 0 Skipped: 0 Warnings: 0 
select * from t1;

a	b

Osnabrck	Kln

drop table t1;

create table t1 (a binary(1), b blob);

insert into t1 values ('','');



/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;

/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;

/*!40101 SET NAMES utf8 */;

/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;

/*!40103 SET TIME_ZONE='+00:00' */;

/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;

/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;

/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `a` binary(1) default NULL,

  `b` blob

) ENGINE=MyISAM DEFAULT CHARSET=latin1;





/*!40000 ALTER TABLE `t1` DISABLE KEYS */;

LOCK TABLES `t1` WRITE;

INSERT INTO `t1` VALUES (0x00,'');

UNLOCK TABLES;

/*!40000 ALTER TABLE `t1` ENABLE KEYS */;

/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;

/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;





/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;

/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;

/*!40101 SET NAMES utf8 */;

/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;

/*!40103 SET TIME_ZONE='+00:00' */;

/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;

/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;

/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `a` binary(1) default NULL,

  `b` blob

) ENGINE=MyISAM DEFAULT CHARSET=latin1;





/*!40000 ALTER TABLE `t1` DISABLE KEYS */;

LOCK TABLES `t1` WRITE;

INSERT INTO `t1` VALUES (0x00,'');

UNLOCK TABLES;

/*!40000 ALTER TABLE `t1` ENABLE KEYS */;

/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;

/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;



drop table t1;

create table t1(a int);

create view v1 as select * from t1;
@@ -2588,3 +2657,4 @@ DELIMITER ; 
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;



DROP TRIGGER tr1;

DROP TABLE t1;