From f715c9c205a99c1d97cb0f9630fc52e1a916a78d Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Tue, 28 Sep 2010 01:18:06 +0300 Subject: Move maria_upgrade() out of maria_init() as in standalone programs maria_data_root is not set. Fixed failing pbxt test include/maria.h: Added maria_upgrade() mysql-test/suite/pbxt/r/select.result: Don't print number of rows as this is not constant over different runs mysql-test/suite/pbxt/t/select.test: Don't print number of rows as this is not constant over different runs storage/maria/ha_maria.cc: Run maria_upgrade() before maria_init() storage/maria/ma_init.c: Move maria_upgrade() out of maria_init() as in standalone programs maria_data_root is not set. --- include/maria.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/maria.h') diff --git a/include/maria.h b/include/maria.h index 0e406d747be..8e5c485767a 100644 --- a/include/maria.h +++ b/include/maria.h @@ -283,6 +283,7 @@ extern int (*maria_test_invalid_symlink)(const char *filename); extern int maria_init(void); extern void maria_end(void); +extern my_bool maria_upgrade(void); extern int maria_close(MARIA_HA *file); extern int maria_delete(MARIA_HA *file, const uchar *buff); extern MARIA_HA *maria_open(const char *name, int mode, -- cgit v1.2.1