Mercurial > p > mysql-python > mysqldb-2

comparison _mysql_results.c @ 44:2b9a9814daab MySQLdb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
_PyTuple_Resize is stable since 2.2, so we don't need the macro MyTuple_Resize
author kylev
date Tue, 17 Feb 2009 06:02:33 +0000
parents fdf0cabb27be
children 28e9be1ca559
comparison
equal deleted inserted replaced
43:e36420b7ae6e 44:2b9a9814daab
379 if (!row && mysql_errno(&(((_mysql_ConnectionObject *)(self->conn))->connection))) { 379 if (!row && mysql_errno(&(((_mysql_ConnectionObject *)(self->conn))->connection))) {
380 _mysql_Exception((_mysql_ConnectionObject *)self->conn); 380 _mysql_Exception((_mysql_ConnectionObject *)self->conn);
381 goto error; 381 goto error;
382 } 382 }
383 if (!row) { 383 if (!row) {
384 if (MyTuple_Resize(r, i, 0) == -1) goto error; 384 if (_PyTuple_Resize(r, i) == -1) goto error;
385 break; 385 break;
386 } 386 }
387 v = convert_row(self, row); 387 v = convert_row(self, row);
388 if (!v) goto error; 388 if (!v) goto error;
389 PyTuple_SET_ITEM(*r, i, v); 389 PyTuple_SET_ITEM(*r, i, v);
429 return NULL; 429 return NULL;
430 } 430 }
431 convert_row = row_converters[how]; 431 convert_row = row_converters[how];
432 if (maxrows) { 432 if (maxrows) {
433 if (!(r = PyTuple_New(maxrows))) goto error; 433 if (!(r = PyTuple_New(maxrows))) goto error;
434 rowsadded = _mysql__fetch_row(self, &r, skiprows, maxrows, 434 rowsadded = _mysql__fetch_row(self, &r, skiprows, maxrows,
435 convert_row); 435 convert_row);
436 if (rowsadded == -1) goto error; 436 if (rowsadded == -1) goto error;
437 } else { 437 } else {
438 if (self->use) { 438 if (self->use) {
439 maxrows = 1000; 439 maxrows = 1000;
442 rowsadded = _mysql__fetch_row(self, &r, skiprows, 442 rowsadded = _mysql__fetch_row(self, &r, skiprows,
443 maxrows, convert_row); 443 maxrows, convert_row);
444 if (rowsadded == -1) goto error; 444 if (rowsadded == -1) goto error;
445 skiprows += rowsadded; 445 skiprows += rowsadded;
446 if (rowsadded < maxrows) break; 446 if (rowsadded < maxrows) break;
447 if (MyTuple_Resize(&r, skiprows+maxrows, 0) == -1) 447 if (_PyTuple_Resize(&r, skiprows + maxrows) == -1)
448 goto error; 448 goto error;
449 } 449 }
450 } else { 450 } else {
451 /* XXX if overflow, maxrows<0? */ 451 /* XXX if overflow, maxrows<0? */
452 maxrows = (int) mysql_num_rows(self->result); 452 maxrows = (int) mysql_num_rows(self->result);