Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
This commit is contained in:
jani@a193-229-222-105.elisa-laajakaista.fi 2005-07-23 00:15:53 +03:00
commit 8f10662eab
25 changed files with 480 additions and 25 deletions

View file

@ -104,6 +104,7 @@ public:
HEAP_PTR ptr2=*(HEAP_PTR*)ref2;
return ptr1 < ptr2? -1 : (ptr1 > ptr2? 1 : 0);
}
bool check_if_incompatible_data(HA_CREATE_INFO *info, uint table_changes);
private:
void update_key_stats();
};