← Back to branch summary

~james-page/ubuntu/precise/mysql-5.5/misc-fixes

« back to all changes in this revision

Viewing changes to storage/blackhole/ha_blackhole.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-06-11 07:34:33 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120611073433-l9za2ni4ipp848y3
Tags: 5.5.24-0ubuntu0.12.04.1
https://launchpad.net/bugs/1011371
* SECURITY UPDATE: Update to 5.5.24 to fix security issues (LP: #1011371)
  - http://dev.mysql.com/doc/refman/5.5/en/news-5-5-24.html

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/blackhole/ha_blackhole.cc
151
151
  else
152
152
    rc= HA_ERR_END_OF_FILE;
153
153
  MYSQL_READ_ROW_DONE(rc);
 
154
  table->status= rc ? STATUS_NOT_FOUND : 0;
154
155
  DBUG_RETURN(rc);
155
156
}
156
157
 
241
242
  else
242
243
    rc= HA_ERR_END_OF_FILE;
243
244
  MYSQL_INDEX_READ_ROW_DONE(rc);
 
245
  table->status= rc ? STATUS_NOT_FOUND : 0;
244
246
  DBUG_RETURN(rc);
245
247
}
246
248
 
258
260
  else
259
261
    rc= HA_ERR_END_OF_FILE;
260
262
  MYSQL_INDEX_READ_ROW_DONE(rc);
 
263
  table->status= rc ? STATUS_NOT_FOUND : 0;
261
264
  DBUG_RETURN(rc);
262
265
}
263
266
 
274
277
  else
275
278
    rc= HA_ERR_END_OF_FILE;
276
279
  MYSQL_INDEX_READ_ROW_DONE(rc);
 
280
  table->status= rc ? STATUS_NOT_FOUND : 0;
277
281
  DBUG_RETURN(rc);
278
282
}
279
283
 
285
289
  MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
286
290
  rc= HA_ERR_END_OF_FILE;
287
291
  MYSQL_INDEX_READ_ROW_DONE(rc);
 
292
  table->status= STATUS_NOT_FOUND;
288
293
  DBUG_RETURN(rc);
289
294
}
290
295
 
296
301
  MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
297
302
  rc= HA_ERR_END_OF_FILE;
298
303
  MYSQL_INDEX_READ_ROW_DONE(rc);
 
304
  table->status= STATUS_NOT_FOUND;
299
305
  DBUG_RETURN(rc);
300
306
}
301
307
 
307
313
  MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
308
314
  rc= HA_ERR_END_OF_FILE;
309
315
  MYSQL_INDEX_READ_ROW_DONE(rc);
 
316
  table->status= STATUS_NOT_FOUND;
310
317
  DBUG_RETURN(rc);
311
 
  DBUG_RETURN(HA_ERR_END_OF_FILE);
312
318
}
313
319
 
314
320
 
319
325
  MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
320
326
  rc= HA_ERR_END_OF_FILE;
321
327
  MYSQL_INDEX_READ_ROW_DONE(rc);
 
328
  table->status= STATUS_NOT_FOUND;
322
329
  DBUG_RETURN(rc);
323
330
}
324
331