diff options
| author | unknown <heikki@donna.mysql.fi> | 2002-01-28 22:18:49 +0200 |
|---|---|---|
| committer | unknown <heikki@donna.mysql.fi> | 2002-01-28 22:18:49 +0200 |
| commit | ac540e96a915c30034a4fc03ef65b60b8392f664 (patch) | |
| tree | aa7f771761883b28925048ff5e37e2eb85d77c00 /innobase/pars/lexyy.c | |
| parent | 2aa572433b9ce47a511958ce263c8400c2e81ac3 (diff) | |
| download | mariadb-git-ac540e96a915c30034a4fc03ef65b60b8392f664.tar.gz | |
Many files:
Merge InnoDB-.48
sql/ha_innobase.cc:
Merge InnoDB-.48
innobase/include/dict0dict.h:
Merge InnoDB-.48
innobase/include/dict0mem.h:
Merge InnoDB-.48
innobase/include/mem0dbg.h:
Merge InnoDB-.48
innobase/include/mem0mem.h:
Merge InnoDB-.48
innobase/include/que0que.h:
Merge InnoDB-.48
innobase/include/row0mysql.h:
Merge InnoDB-.48
innobase/include/srv0srv.h:
Merge InnoDB-.48
innobase/include/trx0sys.h:
Merge InnoDB-.48
innobase/include/trx0trx.h:
Merge InnoDB-.48
innobase/include/mem0mem.ic:
Merge InnoDB-.48
innobase/dict/dict0dict.c:
Merge InnoDB-.48
innobase/dict/dict0mem.c:
Merge InnoDB-.48
innobase/log/log0recv.c:
Merge InnoDB-.48
innobase/mem/mem0dbg.c:
Merge InnoDB-.48
innobase/mem/mem0mem.c:
Merge InnoDB-.48
innobase/pars/lexyy.c:
Merge InnoDB-.48
innobase/que/que0que.c:
Merge InnoDB-.48
innobase/rem/rem0rec.c:
Merge InnoDB-.48
innobase/row/row0mysql.c:
Merge InnoDB-.48
innobase/row/row0sel.c:
Merge InnoDB-.48
innobase/srv/srv0srv.c:
Merge InnoDB-.48
innobase/sync/sync0arr.c:
Merge InnoDB-.48
innobase/trx/trx0sys.c:
Merge InnoDB-.48
innobase/trx/trx0trx.c:
Merge InnoDB-.48
innobase/trx/trx0undo.c:
Merge InnoDB-.48
Diffstat (limited to 'innobase/pars/lexyy.c')
| -rw-r--r-- | innobase/pars/lexyy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/pars/lexyy.c b/innobase/pars/lexyy.c index 67bd12afa60..10bdcdd0990 100644 --- a/innobase/pars/lexyy.c +++ b/innobase/pars/lexyy.c @@ -7373,7 +7373,7 @@ void *ptr; unsigned int size; #endif { - return (void *) mem_realloc( ptr, size ); + return (void *) mem_realloc( ptr, size, __FILE__, __LINE__ ); } #ifdef YY_USE_PROTOS |