Commit 60ad4224 authored by monty@bitch.mysql.fi's avatar monty@bitch.mysql.fi
Browse files

Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0

parents cf40a990 cb754eb5

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -446,3 +446,4 @@ vio/test-sslclient 
vio/test-sslserver

vio/viotest-ssl

sql-bench/test-transactions

libmysqld/sql_do.cc

Docs/manual.texi

+27 −2
Original line number Diff line number Diff line
@@ -2817,7 +2817,7 @@ Use of @code{REPLACE} instead of @code{DELETE} + @code{INSERT}. 
@xref{REPLACE, , @code{REPLACE}}.















@item













The @code{FLUSH flush_option} statement.













The @code{FLUSH}, @code{RESET} and @code{DO} statements.





























@item















The ability to set variables in a statement with @code{:=}:










@@ -32040,6 +32040,9 @@ and @code{NULL} if the named lock didn't exist.  The lock will not exist if













it was never obtained by a call to @code{GET_LOCK()} or if it already has















been released.



























The @code{DO} statement is convinient to use with @code{RELEASE_LOCK()}.













@xref{DO}.



























@findex BENCHMARK()















@item BENCHMARK(count,expr)















The @code{BENCHMARK()} function executes the expression @code{expr}










@@ -32270,6 +32273,7 @@ mysql> SELECT id,FLOOR(value/100) FROM tbl_name ORDER BY RAND();













* TRUNCATE::                    @code{TRUNCATE} Syntax















* REPLACE::                     @code{REPLACE} Syntax















* LOAD DATA::                   @code{LOAD DATA INFILE} Syntax













* DO::                          @code{DO} Syntax















@end menu





























@node SELECT, HANDLER, Data Manipulation, Data Manipulation










@@ -33346,7 +33350,7 @@ The above makes it easy to check if @code{REPLACE} added or replaced a













row.









































@node LOAD DATA,  , REPLACE, Data Manipulation













@node LOAD DATA, DO, REPLACE, Data Manipulation















@subsection @code{LOAD DATA INFILE} Syntax





























@findex LOAD DATA INFILE










@@ -33842,6 +33846,23 @@ For more information about the efficiency of @code{INSERT} versus













@xref{Insert speed}.









































@node DO,  , LOAD DATA, Data Manipulation













@subsection @code{DO} Syntax

























@findex DO

























@example













DO expression, [expression, ...]













@end example

























Execute the expression but don't return any results.  This is a













shorthand of @code{SELECT expression, expression}, but has the advantage













that it's slightly faster when you don't care about the result.

























This is mainly useful with functions that has side effects, like













@code{RELEASE_LOCK}.







































@node Data Definition, Basic User Commands, Data Manipulation, Reference















@section Data Definition: @code{CREATE}, @code{DROP}, @code{ALTER}
























@@ -48060,6 +48081,10 @@ not yet 100% confident in this code.













@appendixsubsec Changes in release 3.23.47















@itemize @bullet















@item













Fixed core-dump bug in replication when using SELECT RELEASE_LOCK();













@item













Added new statement DO expression,[expression].













@item















Added @code{slave-skip-errors} option















@item















Added statistics variables for all MySQL commands. (@code{SHOW STATUS} is

























include/m_string.h



+1
−0






























Original line number
Diff line number
Diff line








@@ -134,6 +134,7 @@ extern	int bcmp(const char *s1,const char *s2,uint len);













#endif















#ifdef HAVE_purify















extern	int my_bcmp(const char *s1,const char *s2,uint len);













#undef bcmp















#define bcmp(A,B,C) my_bcmp((A),(B),(C))















#endif

















































innobase/dict/dict0dict.c



+5
−3






























Original line number
Diff line number
Diff line








@@ -455,7 +455,7 @@ dict_table_get(













	mutex_exit(&(dict_sys->mutex));































	if (table != NULL) {













		if (table->stat_last_estimate_counter == (ulint)(-1)) {













	        if (!table->stat_initialized) {















			dict_update_statistics(table);















		}















	}










@@ -2619,7 +2619,9 @@ dict_update_statistics_low(













	table->stat_sum_of_other_index_sizes = sum_of_index_sizes















						- index->stat_index_size;





























	table->stat_last_estimate_counter = table->stat_modif_counter;













	table->stat_initialized = TRUE;



























        table->stat_modified_counter = 0;















}































/*************************************************************************

































innobase/dict/dict0mem.c



+2
−2






























Original line number
Diff line number
Diff line








@@ -73,9 +73,9 @@ dict_mem_table_create(





























	table->does_not_fit_in_memory = FALSE;





























	table->stat_last_estimate_counter = (ulint)(-1);













	table->stat_initialized = FALSE;





























	table->stat_modif_counter = 0;













	table->stat_modified_counter = 0;















	















	mutex_create(&(table->autoinc_mutex));















	mutex_set_level(&(table->autoinc_mutex), SYNC_DICT_AUTOINC_MUTEX);