diff options
author | Jimmy Yang <jimmy.yang@oracle.com> | 2011-01-14 23:24:47 -0800 |
---|---|---|
committer | Jimmy Yang <jimmy.yang@oracle.com> | 2011-01-14 23:24:47 -0800 |
commit | 5a0138e250b9feccf1e8e6335ea861892e5b37dd (patch) | |
tree | 16c4aeaa65f1fac8cca4d0ff4f0b3353e0a5b492 /storage/innobase/include/rem0cmp.h | |
parent | c233065038be3016fcd981181671d3789c19d6ae (diff) | |
parent | 9cd4d4984025857782e12e53d32cea5e4b7684e5 (diff) | |
download | mariadb-git-5a0138e250b9feccf1e8e6335ea861892e5b37dd.tar.gz |
Merge from mysql-5.1-innodb to mysql-5.5-innodb
Diffstat (limited to 'storage/innobase/include/rem0cmp.h')
-rw-r--r-- | storage/innobase/include/rem0cmp.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/innobase/include/rem0cmp.h b/storage/innobase/include/rem0cmp.h index 2f751a38864..a908521c9f7 100644 --- a/storage/innobase/include/rem0cmp.h +++ b/storage/innobase/include/rem0cmp.h @@ -165,6 +165,10 @@ cmp_rec_rec_with_match( const ulint* offsets1,/*!< in: rec_get_offsets(rec1, index) */ const ulint* offsets2,/*!< in: rec_get_offsets(rec2, index) */ dict_index_t* index, /*!< in: data dictionary index */ + ibool nulls_unequal, + /* in: TRUE if this is for index statistics + cardinality estimation, and innodb_stats_method + is "nulls_unequal" or "nulls_ignored" */ ulint* matched_fields, /*!< in/out: number of already completely matched fields; when the function returns, contains the value the for current |