Commit 440bff25 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Merge work:/home/bk/mysql-4.0 

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
parents 21424657 f8e6e74c

Docs/manual.texi

+4 −0
Original line number Diff line number Diff line
@@ -45712,6 +45712,10 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}. 














@itemize @bullet















@item













Cleaned up global lock handling for @code{FLUSH TABLES WITH READ LOCK}













@item













Fixed problem with @code{DATETIME = constant} in @code{WHERE} optimization.













@item















Speed up all internal list handling.















@item















Added support for @code{UNION}.

























client/mysqlbinlog.cc



+1
−0






























Original line number
Diff line number
Diff line








@@ -21,6 +21,7 @@













#include <m_string.h>















#include <my_sys.h>















#include <getopt.h>













#include <my_pthread.h>















#include <thr_alarm.h>















#include <mysql.h>















#include "log_event.h"

































include/global.h



+3
−3






























Original line number
Diff line number
Diff line








@@ -781,9 +781,9 @@ typedef union {













				  *((uchar*) (T))=  (uchar)(def_temp); \















				  *((uchar*) (T+1))=(uchar)((def_temp >> 8)); }















#define int3store(T,A)		{ /*lint -save -e734 */\













				  *((T))=(char) ((A));\













				  *((T)+1)=(char) (((A) >> 8));\













				  *((T)+2)=(char) (((A) >> 16)); \













				  *((uchar*)(T))=(uchar) ((A));\













				  *((uchar*) (T)+1)=(uchar) (((A) >> 8));\













				  *((uchar*)(T)+2)=(uchar) (((A) >> 16)); \















				  /*lint -restore */}















#define int4store(T,A)		{ *(T)=(char) ((A));\















				  *((T)+1)=(char) (((A) >> 8));\

































include/mysql_com.h



+3
−3






























Original line number
Diff line number
Diff line








@@ -146,15 +146,15 @@ enum enum_field_types { FIELD_TYPE_DECIMAL, FIELD_TYPE_TINY,













#define FIELD_TYPE_CHAR FIELD_TYPE_TINY		/* For compability */















#define FIELD_TYPE_INTERVAL FIELD_TYPE_ENUM	/* For compability */





























extern unsigned long max_allowed_packet;













extern unsigned long net_buffer_length;





























#define net_new_transaction(net) ((net)->pkt_nr=0)































#ifdef __cplusplus















extern "C" {















#endif





























extern unsigned long max_allowed_packet;













extern unsigned long net_buffer_length;





























int	my_net_init(NET *net, Vio* vio);















void	net_end(NET *net);















void	net_clear(NET *net);

































include/mysqld_error.h



+2
−1






























Original line number
Diff line number
Diff line








@@ -217,4 +217,5 @@













#define ER_ERROR_WHEN_EXECUTING_COMMAND 1214















#define ER_WRONG_USAGE 1215















#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1216













#define ER_ERROR_MESSAGES 217












#define ER_CANT_UPDATE_WITH_READLOCK 1217













#define ER_ERROR_MESSAGES 218