diff options
| author | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2007-05-24 13:24:36 +0300 |
|---|---|---|
| committer | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2007-05-24 13:24:36 +0300 |
| commit | fc3b3a0a864fd142f65bbd5ff611d2f09041a258 (patch) | |
| tree | 94027c861a0c3fd6ad62c4bee7ae5f7b1088f056 /mysys/my_div.c | |
| parent | 2ff938d21c596d1769076d2703b22120d2cf8336 (diff) | |
| parent | 088e2395f1833f16c2ea3f7405f604165b4aa2cc (diff) | |
| download | mariadb-git-fc3b3a0a864fd142f65bbd5ff611d2f09041a258.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
Diffstat (limited to 'mysys/my_div.c')
| -rw-r--r-- | mysys/my_div.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_div.c b/mysys/my_div.c index 656c6cfde91..d29d3668852 100644 --- a/mysys/my_div.c +++ b/mysys/my_div.c @@ -23,7 +23,7 @@ fd File descriptor */ -my_string my_filename(File fd) +char * my_filename(File fd) { DBUG_ENTER("my_filename"); if ((uint) fd >= (uint) my_file_limit) |