diff options
| author | unknown <monty@mysql.com> | 2006-06-30 20:07:33 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-06-30 20:07:33 +0300 |
| commit | 0bbc6fbeb7cb60d263510ce1f4c116a69ec77f95 (patch) | |
| tree | da64f683229006c098861b31377eeea29039ae5c /include/my_handler.h | |
| parent | 9606675ba20eb309a1f402f92d06e2de8aed22d2 (diff) | |
| download | mariadb-git-0bbc6fbeb7cb60d263510ce1f4c116a69ec77f95.tar.gz | |
After merge fixes
BitKeeper/etc/ignore:
added scripts/mysql_upgrade_shell
include/my_handler.h:
my_handler.h should not include my_global.h
mysql-test/r/key.result:
Update results after merge
Diffstat (limited to 'include/my_handler.h')
| -rw-r--r-- | include/my_handler.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/my_handler.h b/include/my_handler.h index d531e0fb3e1..61665090853 100644 --- a/include/my_handler.h +++ b/include/my_handler.h @@ -18,7 +18,6 @@ #ifndef _my_handler_h #define _my_handler_h -#include "my_global.h" #include "my_base.h" #include "m_ctype.h" #include "myisampack.h" |