1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into mysql.com:/home/my/mysql-5.0
This commit is contained in:
monty@mysql.com 2005-03-16 12:03:00 +02:00
commit 8e54dece31
6 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.bzrignore
View File

@ -1106,3 +1106,4 @@ vio/test-ssl
vio/test-sslclient vio/test-sslclient
vio/test-sslserver vio/test-sslserver
vio/viotest-ssl vio/viotest-ssl
VC++Files/client/mysql_amd64.dsp

2
client/mysql.cc
View File

@ -2154,7 +2154,7 @@ print_table_data_xml(MYSQL_RES *result)
for (uint i=0; i < mysql_num_fields(result); i++) for (uint i=0; i < mysql_num_fields(result); i++)
{ {
tee_fprintf(PAGER, "\t<field name=\""); 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, "\">"); tee_fprintf(PAGER, "\">");
xmlencode_print(cur[i], lengths[i]); xmlencode_print(cur[i], lengths[i]);
tee_fprintf(PAGER, "</field>\n"); tee_fprintf(PAGER, "</field>\n");

14
innobase/row/row0sel.c
View File

@ -2100,9 +2100,12 @@ row_sel_convert_mysql_key_to_innobase(
/* Calculate data length and data field total length */ /* Calculate data length and data field total length */
if (type == DATA_BLOB) { if (type == DATA_BLOB || ( type == DATA_VARCHAR &&
/* The key field is a column prefix of a BLOB or dtype_get_mysql_type(dfield_get_type(dfield))
TEXT type column */ == 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); ut_a(field->prefix_len > 0);
@ -2118,7 +2121,10 @@ row_sel_convert_mysql_key_to_innobase(
data_len = key_ptr[data_offset] data_len = key_ptr[data_offset]
+ 256 * key_ptr[data_offset + 1]; + 256 * key_ptr[data_offset + 1];
data_field_len = data_offset + 2 + field->prefix_len; data_field_len = data_offset + 2 + field->prefix_len;
data_offset += 2;
if (type == DATA_BLOB) {
data_offset += 2;
}
/* now that we know the length, we store the column /* now that we know the length, we store the column
value like it would be a fixed char field */ value like it would be a fixed char field */

14
mysql-test/mysql-test-run.sh
View File

@ -1541,12 +1541,14 @@ run_testcase ()
disable_test $tname "$comment" disable_test $tname "$comment"
return return
fi fi
comment=`$GREP "^$tname *: *" $TESTDIR/disabled.def`; if [ -f "$TESTDIR/disabled.def" ] ; then
if [ -n "$comment" ] comment=`$GREP "^$tname *: *" $TESTDIR/disabled.def`;
then if [ -n "$comment" ]
comment=`echo $comment | sed 's/^[^:]*: *//'` then
disable_test $tname "$comment" comment=`echo $comment | sed 's/^[^:]*: *//'`
return disable_test $tname "$comment"
return
fi
fi fi
if [ "x$USE_EMBEDDED_SERVER" != "x1" ] ; then if [ "x$USE_EMBEDDED_SERVER" != "x1" ] ; then

8
mysql-test/t/disabled.def
View File

@ -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

6
sql/ha_innodb.cc
View File

@ -3021,9 +3021,11 @@ calc_row_difference(
col_pack_len, col_pack_len,
prebuilt->table->comp); prebuilt->table->comp);
ufield->new_val.data = ufield->new_val.data =
dfield_get_data(&dfield); dfield_get_data_noninline(
&dfield);
ufield->new_val.len = ufield->new_val.len =
dfield_get_len(&dfield); dfield_get_len_noninline(
&dfield);
} else { } else {
ufield->new_val.data = NULL; ufield->new_val.data = NULL;
ufield->new_val.len = UNIV_SQL_NULL; ufield->new_val.len = UNIV_SQL_NULL;