Commit 045e3114 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge

parents 284aa787 0a050cf4

Docs/manual.texi

+381 −371
Original line number Diff line number Diff line
@@ -20022,6 +20022,10 @@ Create Table: CREATE TABLE t ( 














@end example



























@code{SHOW CREATE TABLE} will quote table and column names according to













@code{SQL_QUOTE_SHOW_CREATE} option.













@ref{SET OPTION, , @code{SET OPTION SQL_QUOTE_SHOW_CREATE}}.



























@findex EXPLAIN















@findex SELECT, optimizing















@node EXPLAIN, DESCRIBE, SHOW, Reference










@@ -20565,7 +20569,7 @@ for a table with an auto_increment row with the following construct:













@code{WHERE auto_increment_column IS NULL}.  This is used by some















ODBC programs like Access.



























@item SET AUTOCOMMIT= 0 | 1













@item AUTOCOMMIT= 0 | 1















If set to @code{1} all changes to a table will be done at once. To start















an multi command transaction you have to use the @code{BEGIN}















statement. @xref{COMMIT}. If set to @code{0} you have to use @code{COMMIT} /










@@ -20634,6 +20638,12 @@ If set to @code{0}, no logging will be done to the update log for the client,













if the client has the @strong{process} privilege.  This does not affect the















standard log!



























@item SQL_QUOTE_SHOW_CREATE = 0 | 1













If set to @code{1}, @code{SHOW CREATE TABLE} will quote













table and column names. This is @strong{on} by default,













for replication of tables with fancy column names to work.













@ref{SHOW CREATE TABLE, , @code{SHOW CREATE TABLE}}.



























@item TIMESTAMP = timestamp_value | DEFAULT















Set the time for this client.  This is used to get the original timestamp if















you use the update log to restore rows.

























configure.in



+1
−1






























Original line number
Diff line number
Diff line








@@ -1238,7 +1238,7 @@ AC_CHECK_FUNCS(alarm bmove \













 cuserid fcntl fconvert  \















 getrusage getpwuid getcwd getrlimit getwd index stpcpy locking longjmp \















 perror pread realpath rename \













 socket strnlen madvise \













 socket strnlen madvise mkstemp \















 strtol strtoul strtoull snprintf tempnam thr_setconcurrency \















 gethostbyaddr_r gethostbyname_r getpwnam \















 bfill bzero bcmp strstr strpbrk strerror\

































sql/lex.h



+1
−0






























Original line number
Diff line number
Diff line








@@ -275,6 +275,7 @@ static SYMBOL symbols[] = {













  { "SQL_LOG_UPDATE",	SYM(SQL_LOG_UPDATE),0,0},















  { "SQL_LOW_PRIORITY_UPDATES", SYM(SQL_LOW_PRIORITY_UPDATES),0,0},















  { "SQL_MAX_JOIN_SIZE",SYM(SQL_MAX_JOIN_SIZE), 0, 0},













  { "SQL_QUOTE_SHOW_CREATE",SYM(SQL_QUOTE_SHOW_CREATE), 0, 0},















  { "SQL_SAFE_UPDATES", SYM(SQL_SAFE_UPDATES),0,0},















  { "SQL_SELECT_LIMIT", SYM(SQL_SELECT_LIMIT),0,0},















  { "SQL_SMALL_RESULT", SYM(SQL_SMALL_RESULT),0,0},

































sql/mysql_priv.h



+6
−5






























Original line number
Diff line number
Diff line








@@ -158,6 +158,7 @@ void kill_one_thread(THD *thd, ulong id);













#define OPTION_AUTO_COMMIT	OPTION_BIN_LOG*2















#define OPTION_BEGIN		OPTION_AUTO_COMMIT*2















#define OPTION_QUICK		OPTION_BEGIN*2













#define OPTION_QUOTE_SHOW_CREATE OPTION_QUICK*2































#define RAID_BLOCK_SIZE 1024

















































sql/mysqld.cc



+2
−1






























Original line number
Diff line number
Diff line








@@ -188,7 +188,8 @@ uint test_flags, select_errors=0, dropping_tables=0,ha_open_options=0;













uint volatile thread_count=0, thread_running=0, kill_cached_threads=0,















	      wake_thread=0, global_read_lock=0;















ulong thd_startup_options=(OPTION_UPDATE_LOG | OPTION_AUTO_IS_NULL |













			   OPTION_BIN_LOG | OPTION_AUTO_COMMIT);













			   OPTION_BIN_LOG | OPTION_AUTO_COMMIT |













			   OPTION_QUOTE_SHOW_CREATE );















uint protocol_version=PROTOCOL_VERSION;















ulong keybuff_size,sortbuff_size,max_item_sort_length,table_cache_size,















      max_join_size,join_buff_size,tmp_table_size,thread_stack,