diff options
| author | unknown <monty@bitch.mysql.fi> | 2002-03-16 11:31:13 +0200 |
|---|---|---|
| committer | unknown <monty@bitch.mysql.fi> | 2002-03-16 11:31:13 +0200 |
| commit | 72d3219c043a1d0a3c1751048bcefb12155836d9 (patch) | |
| tree | e75a1c7701356ffcf74891e1b7a4e8ec8c28dfc3 /innobase/pars | |
| parent | 68441ece22c01a6c45a4e86b76fc54c7ef3485d7 (diff) | |
| parent | 52e6db975aaa3787b7083cb51ff7681e66fddbc9 (diff) | |
| download | mariadb-git-72d3219c043a1d0a3c1751048bcefb12155836d9.tar.gz | |
Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0
mysql-test/mysql-test-run.sh:
Auto merged
Diffstat (limited to 'innobase/pars')
| -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 |