diff options
| author | Sergey Vojtovich <svoj@sun.com> | 2009-11-05 16:29:58 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@sun.com> | 2009-11-05 16:29:58 +0400 |
| commit | ced8719400333994131aac1662e95590c78271b7 (patch) | |
| tree | 790d2bb16dfd9d0429e4a6ebd5117195a7c301a8 /storage/innobase/row | |
| parent | 3e2c9aac11a95d8cbb61e1937e4ebe18c7e86698 (diff) | |
| parent | 0212e736136432f8d0442703b55220c0bd9c505e (diff) | |
| download | mariadb-git-ced8719400333994131aac1662e95590c78271b7.tar.gz | |
Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk.
Diffstat (limited to 'storage/innobase/row')
| -rw-r--r-- | storage/innobase/row/row0ins.c | 6 | ||||
| -rw-r--r-- | storage/innobase/row/row0mysql.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/storage/innobase/row/row0ins.c b/storage/innobase/row/row0ins.c index ab3ae70e3e2..fe51fce82c4 100644 --- a/storage/innobase/row/row0ins.c +++ b/storage/innobase/row/row0ins.c @@ -141,7 +141,7 @@ row_ins_alloc_sys_fields( dfield = dtuple_get_nth_field(row, dict_col_get_no(col)); - ptr = mem_heap_alloc(heap, DATA_ROW_ID_LEN); + ptr = mem_heap_zalloc(heap, DATA_ROW_ID_LEN); dfield_set_data(dfield, ptr, DATA_ROW_ID_LEN); @@ -152,7 +152,7 @@ row_ins_alloc_sys_fields( col = dict_table_get_sys_col(table, DATA_TRX_ID); dfield = dtuple_get_nth_field(row, dict_col_get_no(col)); - ptr = mem_heap_alloc(heap, DATA_TRX_ID_LEN); + ptr = mem_heap_zalloc(heap, DATA_TRX_ID_LEN); dfield_set_data(dfield, ptr, DATA_TRX_ID_LEN); @@ -163,7 +163,7 @@ row_ins_alloc_sys_fields( col = dict_table_get_sys_col(table, DATA_ROLL_PTR); dfield = dtuple_get_nth_field(row, dict_col_get_no(col)); - ptr = mem_heap_alloc(heap, DATA_ROLL_PTR_LEN); + ptr = mem_heap_zalloc(heap, DATA_ROLL_PTR_LEN); dfield_set_data(dfield, ptr, DATA_ROLL_PTR_LEN); } diff --git a/storage/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c index 819381fc280..540a4450045 100644 --- a/storage/innobase/row/row0mysql.c +++ b/storage/innobase/row/row0mysql.c @@ -2068,7 +2068,7 @@ Scans a table create SQL string and adds to the data dictionary the foreign key constraints declared in the string. This function should be called after the indexes for a table have been created. Each foreign key constraint must be accompanied with indexes in -bot participating tables. The indexes are allowed to contain more +both participating tables. The indexes are allowed to contain more fields than mentioned in the constraint. Check also that foreign key constraints which reference this table are ok. @return error code or DB_SUCCESS */ |