diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-01-30 16:37:47 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-01-30 16:37:47 +0200 |
| commit | 85278245af45fc301dc7940bec9a3434003285a6 (patch) | |
| tree | 3ca7f6fddbb9bdc0b635f243af69c6606924c3c2 /innobase/pars | |
| parent | 9369764f2226e0e8cb9724bcdac256f45330ba67 (diff) | |
| parent | 8a56717c4ce14aa7e36e04a8dc880dcc1311ea28 (diff) | |
| download | mariadb-git-85278245af45fc301dc7940bec9a3434003285a6.tar.gz | |
Merge from 3.23.48 tree
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/mem/mem0dbg.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/rem/rem0rec.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/trx/trx0undo.c:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/t/join.test:
Auto merged
mysys/hash.c:
Auto merged
scripts/mysql_config.sh:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/sql_acl.cc:
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 |