Commit dc034289 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jonas/src/mysql-5.0
parents e015acc2 6f36a062

.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");

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

sql/ha_innodb.cc

+4 −2
Original line number Diff line number Diff line
@@ -3021,9 +3021,11 @@ calc_row_difference( 
						col_pack_len,

						prebuilt->table->comp);

				ufield->new_val.data =

						dfield_get_data(&dfield);

						dfield_get_data_noninline(

								&dfield);

				ufield->new_val.len =

						dfield_get_len(&dfield);

						dfield_get_len_noninline(

								&dfield);

			} else {

				ufield->new_val.data = NULL;

				ufield->new_val.len = UNIV_SQL_NULL;