diff options
| author | unknown <knielsen@rt.int.sifira.dk> | 2006-07-04 12:08:58 +0200 |
|---|---|---|
| committer | unknown <knielsen@rt.int.sifira.dk> | 2006-07-04 12:08:58 +0200 |
| commit | 520cd485395d058da51fbc89ed5ac2c75701920a (patch) | |
| tree | 7f1051963c806c7b8e99a152c1969c44d6f2b7a7 /include | |
| parent | 3e085bd882a7283d43423c82d412ce276ff4ddcb (diff) | |
| parent | ce3e4de964f656d2f35a953a88eea6e3ce20ca28 (diff) | |
| download | mariadb-git-520cd485395d058da51fbc89ed5ac2c75701920a.tar.gz | |
Merge mysqldev@production:my/mysql-5.0-release
into rt.int.sifira.dk:/usr/local/mysql/tmp-5.0
include/my_sys.h:
Auto merged
mysql-test/r/key.result:
Auto merged
mysql-test/t/key.test:
Auto merged
sql/table.cc:
Auto merged
sql/handler.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index b00b59c4779..9b283ace029 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -597,7 +597,7 @@ extern gptr _my_memdup(const byte *from,uint length, const char *sFile, uint uLine,myf MyFlag); extern my_string _my_strdup(const char *from, const char *sFile, uint uLine, myf MyFlag); -extern char *_my_strdup_with_length(const byte *from, uint length, +extern char *_my_strdup_with_length(const char *from, uint length, const char *sFile, uint uLine, myf MyFlag); |