diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-09-28 01:18:06 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-09-28 01:18:06 +0300 |
| commit | f715c9c205a99c1d97cb0f9630fc52e1a916a78d (patch) | |
| tree | 06eede470846c4b9fdc90468a3a09ecbd2b742b1 /include/maria.h | |
| parent | 0df1789285e2a824e6d77d58f8cd8d974bbe3773 (diff) | |
| download | mariadb-git-f715c9c205a99c1d97cb0f9630fc52e1a916a78d.tar.gz | |
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.
Diffstat (limited to 'include/maria.h')
| -rw-r--r-- | include/maria.h | 1 |
1 files changed, 1 insertions, 0 deletions
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, |