1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

merge 5.5 -> 10.0-base

This commit is contained in:
unknown
2013-09-25 21:07:06 +03:00
42 changed files with 279 additions and 203 deletions

View File

@@ -2862,6 +2862,7 @@ public:
virtual bool check_if_supported_virtual_columns(void) { return FALSE;}
TABLE* get_table() { return table; }
TABLE_SHARE* get_table_share() { return table_share; }
protected:
/* deprecated, don't use in new engines */
inline void ha_statistic_increment(ulong SSV::*offset) const { }
@@ -3115,7 +3116,7 @@ public:
#include "multi_range_read.h"
bool key_uses_partial_cols(TABLE *table, uint keyno);
bool key_uses_partial_cols(TABLE_SHARE *table, uint keyno);
/* Some extern variables used with handlers */