1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

5.3 merge

This commit is contained in:
Sergei Golubchik
2012-02-21 20:51:56 +01:00
57 changed files with 857 additions and 254 deletions

View File

@ -1638,6 +1638,8 @@ public:
{}
};
extern "C" enum icp_result handler_index_cond_check(void* h_arg);
uint calculate_key_len(TABLE *, uint, const uchar *, key_part_map);
/*
bitmap with first N+1 bits set
@ -2857,6 +2859,8 @@ public:
{ return ht; }
inline int ha_write_tmp_row(uchar *buf);
inline int ha_update_tmp_row(const uchar * old_data, uchar * new_data);
friend enum icp_result handler_index_cond_check(void* h_arg);
};
#include "multi_range_read.h"