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

row0mysql.c Fix REPLACE problem, non-latin1 charset bug

Browse Source 
row0upd.c	Fix REPLACE problem, non-latin1 charset bug
rem0cmp.c	Fix REPLACE problem, non-latin1 charset bug


innobase/rem/rem0cmp.c:
  Fix REPLACE problem, non-latin1 charset bug
innobase/row/row0mysql.c:
  Fix REPLACE problem, non-latin1 charset bug
innobase/row/row0upd.c:
  Fix REPLACE problem, non-latin1 charset bug
This commit is contained in:
unknown 2001-03-07 17:22:27 +02:00
parent 9b8ddd1a6d
commit 1b738d5c09
3 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
innobase/rem/rem0cmp.c
View File

@ -171,6 +171,7 @@ cmp_whole_field(
}
return(0);
case DATA_VARMYSQL:
case DATA_MYSQL:
return(innobase_mysql_cmp(
(int)(type->prtype & ~DATA_NOT_NULL),

37
innobase/row/row0mysql.c
View File

@ -634,31 +634,21 @@ row_update_for_mysql(
clust_index = dict_table_get_first_index(table);
if (prebuilt->in_update_remember_pos) {
if (prebuilt->index == clust_index) {
btr_pcur_copy_stored_position(node->pcur,
prebuilt->pcur);
} else {
btr_pcur_copy_stored_position(node->pcur,
prebuilt->clust_pcur);
}
ut_a(node->pcur->rel_pos == BTR_PCUR_ON);
goto skip_cursor_search;
} else {
/* MySQL seems to call rnd_pos before updating each row it
has cached: we can get the correct cursor position from
prebuilt->pcur; NOTE that we cannot build the row reference
from mysql_rec if the clustered index was automatically
generated for the table: MySQL does not know anything about
the row id used as the clustered index key */
if (prebuilt->pcur->btr_cur.index == clust_index) {
btr_pcur_copy_stored_position(node->pcur, prebuilt->pcur);
ut_a(node->pcur->rel_pos == BTR_PCUR_ON);
goto skip_cursor_search;
} else {
btr_pcur_copy_stored_position(node->pcur, prebuilt->clust_pcur);
}
ut_a(node->pcur->rel_pos == BTR_PCUR_ON);
/* MySQL seems to call rnd_pos before updating each row it
has cached: we can get the correct cursor position from
prebuilt->pcur; NOTE that we cannot build the row reference
from mysql_rec if the clustered index was automatically
generated for the table: MySQL does not know anything about
the row id used as the clustered index key */
#ifdef notdefined
/* We have to search for the correct cursor position */
@ -691,7 +681,6 @@ row_update_for_mysql(
mem_heap_free(heap);
#endif
skip_cursor_search:
savept = trx_savept_take(trx);
thr = que_fork_get_first_thr(prebuilt->upd_graph);

2
innobase/row/row0upd.c
View File

@ -1196,7 +1196,7 @@ row_upd(
}
}
if (node->cmpl_info & UPD_NODE_NO_ORD_CHANGE) {
if (!node->is_delete && (node->cmpl_info & UPD_NODE_NO_ORD_CHANGE)) {
goto function_exit;
}