Commit 4edafca6 authored by monty@donna.mysql.fi's avatar monty@donna.mysql.fi
Browse files

Fixed that -ldl is not used for clients 

Fixed rpl000001 to handle the most common mysql-test-run ports.
parent 1e80c3f3

configure.in

+15 −2
Original line number Diff line number Diff line
@@ -1114,8 +1114,16 @@ else 
fi

#---END:



# for user definable functions (must be checked after threads on AIX)

# Check for dlopen, needed for user definable functions

# This must be checked after threads on AIX

# We only need this for mysqld, not for the clients.



my_save_LIBS="$LIBS"

LIBS=""

AC_CHECK_LIB(dl,dlopen)

LIBDL=$LIBS

LIBS="$my_save_LIBS"

AC_SUBST(LIBDL)



# System characteristics

AC_SYS_RESTARTABLE_SYSCALLS
@@ -1346,7 +1354,7 @@ AC_CHECK_FUNCS(alarm bmove \ 
 pthread_setschedparam pthread_attr_setprio pthread_attr_setschedparam \

 pthread_attr_create pthread_getsequence_np pthread_attr_setstacksize \

 pthread_condattr_create rwlock_init pthread_rwlock_rdlock pthread_yield\

 dlopen dlerror fchmod getpass getpassphrase initgroups mlockall)

 fchmod getpass getpassphrase initgroups mlockall)



# Sanity check: We chould not have any fseeko symbol unless

# large_file_support=yes
@@ -1357,6 +1365,11 @@ then 
fi]

)



my_save_LIBS="$LIBS"

LIBS="$LIBS $LIBDL"

AC_CHECK_FUNCS(dlopen dlerror)

LIBS="$my_save_LIBS"



# Check definition of gethostbyaddr_r (glibc2 defines this with 8 arguments)

ac_save_CXXFLAGS="$CXXFLAGS"

AC_CACHE_CHECK([style of gethost* routines], mysql_cv_gethost_style,

mysql-test/r/rpl000001.result

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ sum(length(word)) 
(@id := id) - id

0

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter

127.0.0.1	root	9306	1	master-bin.001	939	No			1053	Slave: query ' update t1 set n = n + get_lock('crash_lock', 2)' partially completed on the master and was aborted. There is a chance that your master is inconsistent at this point. If you are sure that your master is ok, run this query manually on the slave and then restart the slave with SET SQL_SLAVE_SKIP_COUNTER=1; SLAVE START;	0

127.0.0.1	root	9999	1	master-bin.001	939	No			1053	Slave: query ' update t1 set n = n + get_lock('crash_lock', 2)' partially completed on the master and was aborted. There is a chance that your master is inconsistent at this point. If you are sure that your master is ok, run this query manually on the slave and then restart the slave with SET SQL_SLAVE_SKIP_COUNTER=1; SLAVE START;	0

count(*)

10

n

mysql-test/t/rpl000001.test

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ connection slave; 
sync_with_master ;

#give the slave a chance to exit

sleep 0.5;

--replace_result 9306 9999 3334 9999 3335 9999

show slave status;

set sql_slave_skip_counter=1;

slave start;

mysys/my_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
void init_alloc_root(MEM_ROOT *mem_root, uint block_size, uint pre_alloc_size)

{

  mem_root->free=mem_root->used=0;

  mem_root->min_malloc=16;

  mem_root->min_malloc=32;

  mem_root->block_size=block_size-MALLOC_OVERHEAD-sizeof(USED_MEM)-8;

  mem_root->error_handler=0;

#if !(defined(HAVE_purify) && defined(EXTRA_DEBUG))

scripts/mysql_install_db.sh

+6 −3
Original line number Diff line number Diff line
@@ -79,14 +79,17 @@ then 
  basedir=@prefix@

  bindir=@bindir@

  execdir=@libexecdir@ 

elif test -d "$basedir/libexec"

then

else

  bindir="$basedir/bin"

if test -x "$basedir/libexec/mysqld"

then

  execdir="$basedir/libexec"

elif test -x "@libexecdir@/mysqld"

  execdir="@libexecdir@"

else

  bindir="$basedir/bin"

  execdir="$basedir/bin"

fi

fi



mdata=$ldata/mysql