Commit bfe19493 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/my/mysql-5.0
parents 00845876 97a281f5

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1106,3 +1106,4 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl

VC++Files/client/mysql_amd64.dsp

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -2154,7 +2154,7 @@ print_table_data_xml(MYSQL_RES *result) 
    for (uint i=0; i < mysql_num_fields(result); i++)

    {

      tee_fprintf(PAGER, "\t<field name=\"");

      xmlencode_print(fields[i].name, strlen(fields[i].name));

      xmlencode_print(fields[i].name, (uint) strlen(fields[i].name));

      tee_fprintf(PAGER, "\">");

      xmlencode_print(cur[i], lengths[i]);

      tee_fprintf(PAGER, "</field>\n");

innobase/row/row0sel.c

+10 −4
Original line number Diff line number Diff line
@@ -2100,9 +2100,12 @@ row_sel_convert_mysql_key_to_innobase( 


		/* Calculate data length and data field total length */



		if (type == DATA_BLOB) {

			/* The key field is a column prefix of a BLOB or

			TEXT type column */

		if (type == DATA_BLOB || ( type == DATA_VARCHAR &&

			dtype_get_mysql_type(dfield_get_type(dfield))

					== DATA_MYSQL_TRUE_VARCHAR)) {



			/* The key field is a column prefix of a BLOB,

			TEXT, OR TRUE VARCHAR type column */



			ut_a(field->prefix_len > 0);
@@ -2118,7 +2121,10 @@ row_sel_convert_mysql_key_to_innobase( 
			data_len = key_ptr[data_offset]

				   + 256 * key_ptr[data_offset + 1];

			data_field_len = data_offset + 2 + field->prefix_len;



			if (type == DATA_BLOB) {

				data_offset += 2;

			}



			/* now that we know the length, we store the column

			value like it would be a fixed char field */

mysql-test/mysql-test-run.sh

+8 −6
Original line number Diff line number Diff line
@@ -1541,6 +1541,7 @@ run_testcase () 
   disable_test $tname "$comment"

   return

 fi

 if [ -f "$TESTDIR/disabled.def" ] ; then

   comment=`$GREP "^$tname *: *" $TESTDIR/disabled.def`;

   if [ -n "$comment" ]

   then
@@ -1548,6 +1549,7 @@ run_testcase () 
     disable_test $tname "$comment"

     return

   fi

 fi



 if [ "x$USE_EMBEDDED_SERVER" != "x1" ] ; then

   # Stop all slave threads, so that we don't have useless reconnection

mysql-test/t/disabled.def

+0 −8
Original line number Diff line number Diff line
@@ -10,11 +10,3 @@ 
#

##############################################################################

ndb_alter_table   : NDB team needs to fix

ndb_autodiscover  : NDB team needs to fix

ndb_autodiscover2 : NDB team needs to fix

ndb_cache_multi   : NDB team needs to fix

ndb_cache_multi2  : NDB team needs to fix

ndb_multi         : NDB team needs to fix

ndb_restore       : NDB team needs to fix