Commit 67e480d2 authored by Alexey Botchkov's avatar Alexey Botchkov
Browse files

merging fix

parents 69657f97 56f1d326

myisam/mi_static.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ ulong myisam_bulk_insert_tree_size=8192*1024; 
ulong    myisam_data_pointer_size=4;





static int always_valid(const char *filename)

static int always_valid(const char *filename __attribute__((unused)))

{

  return 0;

}

mysql-test/r/udf.result

+6 −0
Original line number Diff line number Diff line 
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 function 'myfunc_nonexist' in library
@@ -197,6 +199,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
@@ -206,6 +210,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,

mysys/my_symlink.c

+8 −0
Original line number Diff line number Diff line
@@ -109,8 +109,16 @@ int my_symlink(const char *content, const char *linkname, myf MyFlags) 


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

}

mysys/thr_lock.c

+1 −1
Original line number Diff line number Diff line
@@ -333,10 +333,10 @@ void thr_lock_init(THR_LOCK *lock) 
void thr_lock_delete(THR_LOCK *lock)

{

  DBUG_ENTER("thr_lock_delete");

  VOID(pthread_mutex_destroy(&lock->mutex));

  pthread_mutex_lock(&THR_LOCK_lock);

  thr_lock_thread_list=list_delete(thr_lock_thread_list,&lock->list);

  pthread_mutex_unlock(&THR_LOCK_lock);

  pthread_mutex_destroy(&lock->mutex);

  DBUG_VOID_RETURN;

}

sql/mysql_priv.h

+3 −0
Original line number Diff line number Diff line
@@ -1343,6 +1343,9 @@ extern char *default_tz_name; 
extern my_bool opt_large_pages;

extern uint opt_large_page_size;



extern char *opt_plugin_dir_ptr;

extern char opt_plugin_dir[FN_REFLEN];



extern MYSQL_LOG mysql_log,mysql_slow_log,mysql_bin_log;

extern FILE *bootstrap_file;

extern int bootstrap_error;