diff options
| author | Michael Widenius <monty@mysql.com> | 2009-01-30 23:55:42 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2009-01-30 23:55:42 +0200 |
| commit | 37db97b0e25de1a1dc0d16bc9b88b0c3a2e9f9a2 (patch) | |
| tree | ce2cae5253aeca0dafdd6a85d636e5419e17bc0d /include/maria.h | |
| parent | dd5b9fc6cd620d0826a10e184c0082880f97513d (diff) | |
| parent | 9aa2ada9d007a41d4e58447ea405b646c4d53ea3 (diff) | |
| download | mariadb-git-37db97b0e25de1a1dc0d16bc9b88b0c3a2e9f9a2.tar.gz | |
Merge with mysql-maria
Changed _ma_ft_convert_to_ft2() to my_bool
storage/maria/ma_ft_update.c:
Changed _ma_ft_convert_to_ft2() to my_bool
storage/maria/ma_fulltext.h:
Changed _ma_ft_convert_to_ft2() to my_bool
storage/maria/ma_write.c:
Manual merge
Changed _ma_ft_convert_to_ft2() to my_bool
Diffstat (limited to 'include/maria.h')
| -rw-r--r-- | include/maria.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/maria.h b/include/maria.h index e230213963d..d8b98bb6401 100644 --- a/include/maria.h +++ b/include/maria.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006 MySQL AB +/* Copyright (C) 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,6 +33,8 @@ extern "C" { #include <myisamchk.h> #include <mysql/plugin.h> +#define MARIA_CANNOT_ROLLBACK + /* Limit max keys according to HA_MAX_POSSIBLE_KEY; See myisamchk.h for details */ |