← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mariadb-5.5/utopic-security

« back to all changes in this revision

Viewing changes to storage/xtradb/dict/dict0load.c

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen
  • Date: 2014-08-27 21:12:36 UTC
  • mfrom: (2.1.6 sid)
  • Revision ID: package-import@ubuntu.com-20140827211236-se41hwfe4xy0hpef
http://bugs.debian.org/759309
http://bugs.debian.org/759813
* d/control: Removed Provides: libmysqlclient-dev (Closes: #759309)
* d/control: Removed Provides: libmysqld-dev with same motivation
* Re-introduced tha HPPA build patch as the upstream fix wasn't complete
* Fixed all kFreeBSD build and test suite issues
* Added Italian translation (Closes: #759813)

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/xtradb/dict/dict0load.c
2196
2196
                ut_a(!rec_get_deleted_flag(rec, 0));
2197
2197
 
2198
2198
                field = rec_get_nth_field_old(rec, 0, &len);
 
2199
 
 
2200
if (len != id_len || ut_memcmp(id, field, len) != 0) {
 
2201
                        char * tmp,*tmp2;
 
2202
 
 
2203
                        tmp = mem_heap_alloc(foreign->heap, id_len+4);
 
2204
                        ut_memcpy(tmp, id, id_len);
 
2205
                        tmp[id_len]='\0';
 
2206
                        tmp2 = mem_heap_alloc(foreign->heap, len+4);
 
2207
                        ut_memcpy(tmp2, id, len);
 
2208
                        tmp2[len]='\0';
 
2209
                        fprintf(stderr, "InnoDB: Error: len = %lu != id_len %lu\n",
 
2210
                                len, id_len);
 
2211
                        fprintf(stderr, "InnoDB: Error: id %s != field %s\n",
 
2212
                                tmp, tmp2);
 
2213
 
 
2214
                }
 
2215
 
2199
2216
                ut_a(len == id_len);
2200
2217
                ut_a(ut_memcmp(id, field, len) == 0);
2201
2218