1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merging fixes

Browse Source
This commit is contained in:
Alexey Botchkov 2008-08-26 14:31:17 +05:00
commit 27ca994dff
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/udf.result
View File

@ -1,5 +1,7 @@
drop table if exists t1; drop table if exists t1;
CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB"; CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
Warnings:
Warning 1105 plugin_dir was not specified
CREATE FUNCTION myfunc_double RETURNS REAL SONAME "UDF_EXAMPLE_LIB"; CREATE FUNCTION myfunc_double RETURNS REAL SONAME "UDF_EXAMPLE_LIB";
CREATE FUNCTION myfunc_nonexist RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB"; CREATE FUNCTION myfunc_nonexist RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB";
ERROR HY000: Can't find symbol 'myfunc_nonexist' in library ERROR HY000: Can't find symbol 'myfunc_nonexist' in library
@ -235,6 +237,8 @@ DROP FUNCTION avgcost;
select * from mysql.func; select * from mysql.func;
name ret dl type name ret dl type
CREATE FUNCTION is_const RETURNS STRING SONAME "UDF_EXAMPLE_LIB"; CREATE FUNCTION is_const RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
Warnings:
Warning 1105 plugin_dir was not specified
select IS_const(3); select IS_const(3);
IS_const(3) IS_const(3)
const const
@ -244,6 +248,8 @@ name ret dl type
select is_const(3); select is_const(3);
ERROR 42000: FUNCTION test.is_const does not exist ERROR 42000: FUNCTION test.is_const does not exist
CREATE FUNCTION is_const RETURNS STRING SONAME "UDF_EXAMPLE_LIB"; CREATE FUNCTION is_const RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
Warnings:
Warning 1105 plugin_dir was not specified
select select
is_const(3) as const, is_const(3) as const,
is_const(3.14) as const, is_const(3.14) as const,

8
mysys/my_symlink.c
View File

@ -111,8 +111,16 @@ int my_symlink(const char *content, const char *linkname, myf MyFlags)
int my_is_symlink(const char *filename __attribute__((unused))) int my_is_symlink(const char *filename __attribute__((unused)))
{ {
#if defined (HAVE_LSTAT) && defined (S_ISLNK)
struct stat stat_buff; struct stat stat_buff;
return !lstat(filename, &stat_buff) && S_ISLNK(stat_buff.st_mode); return !lstat(filename, &stat_buff) && S_ISLNK(stat_buff.st_mode);
#elif defined (_WIN32)
DWORD dwAttr = GetFileAttributes(filename);
return (dwAttr != INVALID_FILE_ATTRIBUTES) &&
(dwAttr & FILE_ATTRIBUTE_REPARSE_POINT);
#else /* No symlinks */
return 0;
#endif
} }

2
storage/myisam/mi_static.c
View File

@ -42,7 +42,7 @@ ulong myisam_bulk_insert_tree_size=8192*1024;
ulong myisam_data_pointer_size=4; ulong myisam_data_pointer_size=4;
static int always_valid(const char *filename) static int always_valid(const char *filename __attribute__((unused)))
{ {
return 0; return 0;
} }