diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-04-19 11:11:30 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-04-19 11:11:30 +0200 |
| commit | 812520315318e358d2d9daf9ca709578af1efe40 (patch) | |
| tree | d5dff4f4c06aa4554707a6ad717dc73a576313d0 /storage/connect/connect.h | |
| parent | cc7a08c9410335237e6c19f84d9c5d08938b8e8a (diff) | |
| parent | b43e82dce63c07abe8de740b3bf18a33600ccac0 (diff) | |
| download | mariadb-git-812520315318e358d2d9daf9ca709578af1efe40.tar.gz | |
- Commit merged files
modified:
storage/connect/CMakeLists.txt
storage/connect/connect.h
storage/connect/global.h
storage/connect/ha_connect.cc
storage/connect/ha_connect.h
storage/connect/myconn.cpp
storage/connect/myconn.h
storage/connect/mysql-test/connect/r/pivot.result
storage/connect/mysql-test/connect/suite.pm
storage/connect/mysql-test/connect/t/pivot.test
storage/connect/myutil.cpp
storage/connect/osutil.c
storage/connect/plgdbsem.h
storage/connect/plugutil.c
storage/connect/tabmysql.cpp
storage/connect/tabpivot.cpp
storage/connect/tabutil.cpp
storage/connect/user_connect.cc
storage/connect/valblk.cpp
storage/connect/valblk.h
storage/connect/value.cpp
storage/connect/value.h
storage/connect/xindex.cpp
storage/connect/xindex.h
Diffstat (limited to 'storage/connect/connect.h')
| -rw-r--r-- | storage/connect/connect.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/connect/connect.h b/storage/connect/connect.h index be423fcb575..380da7c29b9 100644 --- a/storage/connect/connect.h +++ b/storage/connect/connect.h @@ -36,8 +36,7 @@ bool CntRewindTable(PGLOBAL g, PTDB tdbp); int CntCloseTable(PGLOBAL g, PTDB tdbp); int CntIndexInit(PGLOBAL g, PTDB tdbp, int id); RCODE CntReadNext(PGLOBAL g, PTDB tdbp); -RCODE CntIndexRead(PGLOBAL g, PTDB, OPVAL op, const void *k, int n, - bool mrr = false); +RCODE CntIndexRead(PGLOBAL g, PTDB, OPVAL op, const void *k, int n, bool mrr); RCODE CntWriteRow(PGLOBAL g, PTDB tdbp); RCODE CntUpdateRow(PGLOBAL g, PTDB tdbp); RCODE CntDeleteRow(PGLOBAL g, PTDB tdbp, bool all); |