diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-12-15 10:34:14 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-12-15 10:34:14 +0100 |
| commit | a6c7c53b63384f0b58ff8e34798c0952ed6ac7a7 (patch) | |
| tree | 5d4eaafa051042a726cc5ad7376b13b96111f6cd /storage/xtradb/include/os0file.h | |
| parent | 79479ee97571e8023b0269ffddbf525d54955273 (diff) | |
| parent | 6afbf295f018e077be7c569ef8e433e510441bea (diff) | |
| download | mariadb-git-a6c7c53b63384f0b58ff8e34798c0952ed6ac7a7.tar.gz | |
Merge XtraDB from Percona-server-5.5.17-rel22.1 into MariaDB 5.5
Diffstat (limited to 'storage/xtradb/include/os0file.h')
| -rw-r--r-- | storage/xtradb/include/os0file.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/xtradb/include/os0file.h b/storage/xtradb/include/os0file.h index c476d14d51d..b153b0dba7f 100644 --- a/storage/xtradb/include/os0file.h +++ b/storage/xtradb/include/os0file.h @@ -290,7 +290,8 @@ The wrapper functions have the prefix of "innodb_". */ __FILE__, __LINE__) # define os_file_read_trx(file, buf, offset, offset_high, n, trx) \ - os_file_read_func(file, buf, offset, offset_high, n, trx) + pfs_os_file_read_func(file, buf, offset, offset_high, n, trx, \ + __FILE__, __LINE__) # define os_file_read_no_error_handling(file, buf, offset, \ offset_high, n) \ |