mirror of
https://github.com/MariaDB/server.git
synced 2025-08-17 21:39:33 +00:00
after merge fixes
include/my_tree.h: After merge fixes mysql-test/r/create.result: After merge fixes mysql-test/r/insert.result: After merge fixes mysql-test/r/multi_update.result: After merge fixes mysql-test/r/query_cache.result: After merge fixes mysql-test/r/rpl_error_ignored_table.result: After merge fixes mysql-test/r/rpl_optimize.result: After merge fixes mysql-test/r/show_check.result: After merge fixes mysql-test/t/insert.test: After merge fixes (Remove columns with space last) mysql-test/t/multi_update.test: After merge fixes mysql-test/t/show_check.test: After merge fixes sql/field.cc: Remove compiler warnings sql/sql_base.cc: Fix bug when table was refreshed
This commit is contained in:
@ -22,8 +22,8 @@ extern "C" {
|
||||
|
||||
#include "my_base.h" /* get 'enum ha_rkey_function' */
|
||||
|
||||
/* Worst case tree is half full. This gives use 2^(MAX_TREE_HIGHT/2) leafs */
|
||||
#define MAX_TREE_HIGHT 64
|
||||
/* Worst case tree is half full. This gives use 2^(MAX_TREE_HEIGHT/2) leafs */
|
||||
#define MAX_TREE_HEIGHT 64
|
||||
|
||||
#define ELEMENT_KEY(tree,element)\
|
||||
(tree->offset_to_key ? (void*)((byte*) element+tree->offset_to_key) :\
|
||||
|
Reference in New Issue
Block a user