Commit 2f3cfff0 authored by monty@tik.mysql.fi's avatar monty@tik.mysql.fi
Browse files

Added --user=userid to mysqld 

Fix for ctypes on windows
Cleanup max_queries_per_hour
parent 4abd402b

Docs/manual.texi

+5 −3
Original line number Diff line number Diff line
@@ -14207,9 +14207,9 @@ Sets the default transaction isolation level. @xref{SET TRANSACTION}. 
Path for temporary files. It may be useful if your default @code{/tmp}

directory resides on a partition too small to hold temporary tables.













@item -u, --user=user_name













Run @code{mysqld} daemon as user @code{user_name}.  This option is













@emph{mandatory} when starting @code{mysqld} as root.













@item -u, --user= [user_name | userid]













Run @code{mysqld} daemon as user @code{user_name} or @code{userid} (numeric).













This option is @emph{mandatory} when starting @code{mysqld} as root.





























@item -V, --version















Output version information and exit.










@@ -48411,6 +48411,8 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.



























@itemize @bullet















@item













Allow numeric user id to @code{mysqld --user=#}.













@item















Fixed a bug where @code{SQL_CALC_ROWS} returned a wrong value when used















with one table and @code{ORDER BY} and with InnoDB tables.















@item

























include/m_ctype.h



+20
−6






























Original line number
Diff line number
Diff line








@@ -62,9 +62,6 @@ extern const char *compiled_charset_name(uint charset_number);













#define MY_CHARSET_UNDEFINED 0















#define MY_CHARSET_CURRENT (default_charset_info->number)





























#ifdef __WIN__













#include <ctype.h>













#endif















/* Don't include std ctype.h when this is included */















#define _CTYPE_H















#define _CTYPE_H_









@@ -72,6 +69,26 @@ extern const char *compiled_charset_name(uint charset_number);













#define __CTYPE_INCLUDED















#define _CTYPE_USING   /* Don't put names in global namespace. */





























/* Fix things, if ctype.h would have been included before */













#undef toupper













#undef _toupper













#undef _tolower













#undef toupper













#undef tolower













#undef isalpha













#undef isupper













#undef islower













#undef isdigit













#undef isxdigit













#undef isalnum













#undef isspace













#undef ispunct













#undef isprint













#undef isgraph













#undef iscntrl













#undef isascii













#undef toascii





























#define	_U	01	/* Upper case */















#define	_L	02	/* Lower case */















#define	_N	04	/* Numeral (digit) */









@@ -86,7 +103,6 @@ extern const char *compiled_charset_name(uint charset_number);













#define my_to_lower	(default_charset_info->to_lower)















#define my_sort_order	(default_charset_info->sort_order)





























#ifndef __WIN__















#define	_toupper(c)	(char) my_to_upper[(uchar) (c)]















#define	_tolower(c)	(char) my_to_lower[(uchar) (c)]















#define toupper(c)	(char) my_to_upper[(uchar) (c)]









@@ -110,8 +126,6 @@ extern const char *compiled_charset_name(uint charset_number);













#undef ctype















#endif /* ctype */





























#endif	/* __WIN__ */





























#define	my_isalpha(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_U | _L))















#define	my_isupper(s, c)  (((s)->ctype+1)[(uchar) (c)] & _U)















#define	my_islower(s, c)  (((s)->ctype+1)[(uchar) (c)] & _L)





































mysql-test/r/join.result



+22
−0






























Original line number
Diff line number
Diff line








@@ -186,3 +186,25 @@ t3.CanRead='1' AND t3.Active='1';













COUNT(t1.Title)















1















drop table t1,t2,t3;













CREATE TABLE t1 (













t1_id int(11) default NULL,













t2_id int(11) default NULL,













type enum('Cost','Percent') default NULL,













cost_unit enum('Cost','Unit') default NULL,













min_value double default NULL,













max_value double default NULL,













t3_id int(11) default NULL,













item_id int(11) default NULL













) TYPE=MyISAM;













INSERT INTO t1 VALUES (12,5,'Percent','Cost',-1,0,-1,-1),(14,4,'Percent','Cost',-1,0,-1,-1),(18,5,'Percent','Cost',-1,0,-1,-1),(19,4,'Percent','Cost',-1,0,-1,-1),(20,5,'Percent','Cost',100,-1,22,291),(21,5,'Percent','Cost',100,-1,18,291),(22,1,'Percent','Cost',100,-1,6,291),(23,1,'Percent','Cost',100,-1,21,291),(24,1,'Percent','Cost',100,-1,9,291),(25,1,'Percent','Cost',100,-1,4,291),(26,1,'Percent','Cost',100,-1,20,291),(27,4,'Percent','Cost',100,-1,7,202),(28,1,'Percent','Cost',50,-1,-1,137),(29,2,'Percent','Cost',100,-1,4,354),(30,2,'Percent','Cost',100,-1,9,137),(93,2,'Cost','Cost',-1,10000000,-1,-1);













CREATE TABLE t2 (













id int(10) unsigned NOT NULL auto_increment,













name varchar(255) default NULL,













PRIMARY KEY  (id)













) TYPE=MyISAM;













INSERT INTO t2 VALUES (1,'s1'),(2,'s2'),(3,'s3'),(4,'s4'),(5,'s5');













select t1.*, t2.*  from t1, t2 where t2.id=t1.t2_id limit 2;













t1_id	t2_id	type	cost_unit	min_value	max_value	t3_id	item_id	id	name













22	1	Percent	Cost	100	-1	6	291	1	s1













23	1	Percent	Cost	100	-1	21	291	1	s1













drop table t1,t2;