summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorunknown <aivanov@mysql.com>2006-01-30 22:52:15 +0300
committerunknown <aivanov@mysql.com>2006-01-30 22:52:15 +0300
commit8482d14742a51769f98226f67544473a47df5e18 (patch)
tree3cfa9b3e18f08702f96ce15d42dc11954f66f372 /innobase
parentd42c472e31dd3cef1a1afb16c380f486e7c771c5 (diff)
parent8eaf6f11774dfdb2b61e7cebfdc7db78293f0feb (diff)
downloadmariadb-git-8482d14742a51769f98226f67544473a47df5e18.tar.gz
Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss20
into mysql.com:/home/alexi/innodb/mysql-5.0-ss20 innobase/btr/btr0sea.c: Null merged innobase/fil/fil0fil.c: Null merged
Diffstat (limited to 'innobase')
-rw-r--r--innobase/include/btr0sea.ic2
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/include/btr0sea.ic b/innobase/include/btr0sea.ic
index 8a41042f713..f4e33027c25 100644
--- a/innobase/include/btr0sea.ic
+++ b/innobase/include/btr0sea.ic
@@ -16,7 +16,7 @@ Updates the search info. */
void
btr_search_info_update_slow(
/*========================*/
- btr_search_t* info, /* in: search info */
+ btr_search_t* info, /* in/out: search info */
btr_cur_t* cursor);/* in: cursor which was just positioned */
/************************************************************************