Commit 1e3df575 authored by monty@donna.mysql.fi's avatar monty@donna.mysql.fi
Browse files

Fixed probelm with count(*) and normal functions when no matchin rows. 

Changed 'lib' to 'master-data'
Fix for slow slaves
parent 0f37b124

Docs/manual.texi

+3 −0
Original line number Diff line number Diff line
@@ -43943,6 +43943,9 @@ not yet 100% confident in this code. 
@appendixsubsec Changes in release 3.23.38

@itemize @bullet

@item

Fixed problems with function returning empty string when using

together with a group functions and a @code{WHERE} that didn't match any rows.

@item

New program @code{mysqlcheck}.

@item

Added database name to output for admin commands like @code{CHECK},

include/mysql.h

+8 −0
Original line number Diff line number Diff line
@@ -20,6 +20,14 @@ 
#ifndef _mysql_h

#define _mysql_h



#ifdef __CYGWIN__     /* CYGWIN implements a UNIX API */

#undef WIN

#undef _WIN

#undef _WIN32

#undef _WIN64

#undef __WIN__

#endif



#ifndef MYSQL_SERVER

#ifdef	__cplusplus

extern "C" {

libmysql/libmysql.c

+1 −1
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 
   MA 02111-1307, USA */



#define DONT_USE_RAID

#include <global.h>

#if defined(__WIN__) || defined(_WIN32) || defined(_WIN64)

#include <winsock.h>

#include <odbcinst.h>

#endif

#include <global.h>

#include <my_sys.h>

#include <mysys_err.h>

#include <m_string.h>

mysql-test/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ dist-hook: 
	$(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include

	$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r

	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.001 $(distdir)/std_data



install-data-local:

	$(mkinstalldirs) \

mysql-test/include/master-slave.inc

+2 −0
Original line number Diff line number Diff line
@@ -9,5 +9,7 @@ connection master; 
reset master;

connection slave;

reset slave;

# Clean up old test tables

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

slave start;

@r/slave-running.result show status like 'Slave_running';