Commit 3016ec15 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-13318 

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


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Resolve conflicts
mysql-test/t/mysqldump.test:
  Resolve conflicts
parents f604204f eb92d6a1

client/mysqldump.c

+6 −5
Original line number Diff line number Diff line
@@ -2152,6 +2152,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,
@@ -2178,7 +2180,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
@@ -2268,19 +2269,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/mysqldump.result

+63 −0
Original line number Diff line number Diff line
@@ -655,6 +655,69 @@ UNLOCK TABLES; 
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

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



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 */;

/*!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 ('','');

UNLOCK TABLES;

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



/*!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 */;

/*!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 ('','');

UNLOCK TABLES;

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



/*!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;



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

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

mysql-test/t/mysqldump.test

+14 −1
Original line number Diff line number Diff line
@@ -605,6 +605,7 @@ select * from t2 order by a; 


drop table t1, t2;

drop database db1;



#

# Bug #9558 mysqldump --no-data db t1 t2 format still dumps data

#
@@ -685,6 +686,7 @@ drop table t1, t2, t3; 
drop database mysqldump_test_db;

use test;





#

# Bug #9657 mysqldump xml ( -x ) does not format NULL fields correctly

#
@@ -1023,3 +1025,14 @@ SET SQL_MODE = @old_sql_mode; 


DROP TRIGGER tr1;

DROP TABLE t1;



#

# Bug #13318: Bad result with empty field and --hex-blob

# 

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

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

--exec $MYSQL_DUMP --skip-comments --skip-extended-insert --hex-blob test t1

--exec $MYSQL_DUMP --skip-comments --hex-blob test t1

drop table t1;



# End of 4.1 tests