diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-03-28 01:04:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-28 01:04:46 +0200 |
| commit | 20e706689df1eb87c696304797e9d6184c0a75bb (patch) | |
| tree | ff3eab8fa3e060b34687c6e9819cb559ac67d5c5 /storage/myisam/ha_myisam.h | |
| parent | 3d0775e9af2fcf3fe92b7f19e299ea23068eca1e (diff) | |
| parent | bfaebe3f5e4b917c4498e234bad7a9d45d07ca62 (diff) | |
| download | mariadb-git-20e706689df1eb87c696304797e9d6184c0a75bb.tar.gz | |
mysql-5.5.22 merge
mysql-test/suite/innodb/t/group_commit_crash.test:
remove autoincrement to avoid rbr being used for insert ... select
mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test:
remove autoincrement to avoid rbr being used for insert ... select
mysys/my_addr_resolve.c:
a pointer to a buffer is returned to the caller -> the buffer cannot be on the stack
mysys/stacktrace.c:
my_vsnprintf() is ok here, in 5.5
Diffstat (limited to 'storage/myisam/ha_myisam.h')
| -rw-r--r-- | storage/myisam/ha_myisam.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/myisam/ha_myisam.h b/storage/myisam/ha_myisam.h index 7439ea290c6..aa00398e7e7 100644 --- a/storage/myisam/ha_myisam.h +++ b/storage/myisam/ha_myisam.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates + Copyright (c) 2000, 2012, Oracle and/or its affiliates. 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 @@ -36,7 +36,6 @@ typedef struct st_ha_create_information HA_CREATE_INFO; #define HA_RECOVER_FULL_BACKUP 16 /* Make a copy of index file too */ #define HA_RECOVER_OFF 32 /* No automatic recover */ -extern ulong myisam_sort_buffer_size; extern TYPELIB myisam_recover_typelib; extern const char *myisam_recover_names[]; extern ulonglong myisam_recover_options; |