diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-07-15 00:33:24 -0600 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-07-15 00:33:24 -0600 |
| commit | 5b2eabea9dd234a5a19967bb32165ac75d65b817 (patch) | |
| tree | a5e74a70e567b375faa67837da8854bcf895758f /mysys | |
| parent | 8726e4a74f5822fc70dcecdf47ad3f4b0fb2e551 (diff) | |
| parent | 448aa1d8e127d045555bee3a1ec5c4d0074f7fb6 (diff) | |
| download | mariadb-git-5b2eabea9dd234a5a19967bb32165ac75d65b817.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into siva.hindu.god:/usr/home/tim/m/bk/merge-51
(which is mysql-5.1-new-maint team tree)
include/my_base.h:
Auto merged
mysql-test/extra/rpl_tests/rpl_loaddata.test:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/lib/mtr_report.pl:
merge of mysql-5.1 -> mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
merge of mysql-5.1 -> mysql-5.1-new-maint
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_handler.c | 1 | ||||
| -rw-r--r-- | mysys/safemalloc.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysys/my_handler.c b/mysys/my_handler.c index bfec44d57a4..46144c0dff2 100644 --- a/mysys/my_handler.c +++ b/mysys/my_handler.c @@ -15,6 +15,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ +#include <my_global.h> #include "my_handler.h" int mi_compare_text(CHARSET_INFO *charset_info, uchar *a, uint a_length, diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c index b431667063a..518a6a5fdd0 100644 --- a/mysys/safemalloc.c +++ b/mysys/safemalloc.c @@ -525,8 +525,9 @@ char *_my_strdup(const char *from, const char *filename, uint lineno, } /* _my_strdup */ -char *_my_strndup(const char *from, uint length, const char *filename, - uint lineno, myf MyFlags) +char *_my_strndup(const char *from, uint length, + const char *filename, uint lineno, + myf MyFlags) { gptr ptr; if ((ptr=_mymalloc(length+1,filename,lineno,MyFlags)) != 0) |