diff options
| author | unknown <monty@mysql.com> | 2004-03-18 00:09:13 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-18 00:09:13 +0200 |
| commit | 022c5241a9ebcd6047b761ef437f51e62722f9e9 (patch) | |
| tree | 93869dd2e083920baaab586bbd65e0b77b42fcfa /include/my_tree.h | |
| parent | 219bbd5232d6ff958f97b30abbc0cb9646abf6a8 (diff) | |
| download | mariadb-git-022c5241a9ebcd6047b761ef437f51e62722f9e9.tar.gz | |
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
Diffstat (limited to 'include/my_tree.h')
| -rw-r--r-- | include/my_tree.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_tree.h b/include/my_tree.h index 0159dc891e5..14d8593b6dc 100644 --- a/include/my_tree.h +++ b/include/my_tree.h @@ -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) :\ |