bzr commit into mysql-5.1 branch (holyfoot:2721)

[Alexey Botchkov]

#At file:///d2/hf/mysql_common/51mrg/

 2721 Alexey Botchkov	2008-08-26 [merge]
      merging fixes
modified:
  mysql-test/r/udf.result
  mysys/my_symlink.c
  storage/myisam/mi_static.c

=== modified file 'mysql-test/r/udf.result'
--- a/mysql-test/r/udf.result	2008-08-25 12:44:05 +0000
+++ b/mysql-test/r/udf.result	2008-08-26 09:31:17 +0000
@@ -1,5 +1,7 @@
 drop table if exists t1;
 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_nonexist RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB";
 ERROR HY000: Can't find symbol 'myfunc_nonexist' in library
@@ -235,6 +237,8 @@ DROP FUNCTION avgcost;
 select * from mysql.func;
 name	ret	dl	type
 CREATE FUNCTION is_const RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
+Warnings:
+Warning	1105	plugin_dir was not specified
 select IS_const(3);
 IS_const(3)
 const
@@ -244,6 +248,8 @@ name	ret	dl	type
 select is_const(3);
 ERROR 42000: FUNCTION test.is_const does not exist
 CREATE FUNCTION is_const RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
+Warnings:
+Warning	1105	plugin_dir was not specified
 select
 is_const(3) as const,
 is_const(3.14) as const,

=== modified file 'mysys/my_symlink.c'
--- a/mysys/my_symlink.c	2008-08-23 02:47:43 +0000
+++ b/mysys/my_symlink.c	2008-08-26 09:31:17 +0000
@@ -111,8 +111,16 @@ int my_symlink(const char *content, cons
 
 int my_is_symlink(const char *filename __attribute__((unused)))
 {
+#if defined (HAVE_LSTAT) && defined (S_ISLNK)
   struct stat stat_buff;
   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
 }
 
 

=== modified file 'storage/myisam/mi_static.c'
--- a/storage/myisam/mi_static.c	2008-08-23 02:47:43 +0000
+++ b/storage/myisam/mi_static.c	2008-08-26 09:31:17 +0000
@@ -42,7 +42,7 @@ ulong    myisam_bulk_insert_tree_size=81
 ulong    myisam_data_pointer_size=4;
 
 
-static int always_valid(const char *filename)
+static int always_valid(const char *filename __attribute__((unused)))
 {
   return 0;
 }