Merge work:/home/bk/mysql (e8e1e883) · Commits · Software / OSDI20 Artifacts / mariadb

Docs/manual.texi

+21 −3

Original line number	Diff line number	Diff line
		@@ -895,7 +895,8 @@ Changes in release 4.0.x (Development; Alpha)

		Changes in release 3.23.x (Stable)

		* News-3.23.34a::
		* News-3.23.35:: Changes in release 3.23.35
		* News-3.23.34a:: Changes in release 3.23.34a
		* News-3.23.34:: Changes in release 3.23.34
		* News-3.23.33:: Changes in release 3.23.33
		* News-3.23.32:: Changes in release 3.23.32
		@@ -22074,6 +22075,11 @@ or
		mysql> UPDATE mysql.user SET password=PASSWORD("newpass") where user="bob' and host="%.loc.gov";
		@end example

		@item SQL_ANSI_MODE = 0 \| 1
		@cindex ANSI mode, SQL_ANSI_MODE
		If set to @code{1}, the connection will be in ANSI mode, as described in
		@ref{ANSI mode}.

		@item SQL_AUTO_IS_NULL = 0 \| 1
		If set to @code{1} (default) then one can find the last inserted row
		for a table with an auto_increment row with the following construct:
		@@ -42056,7 +42062,9 @@ users uses this code as the rest of the code and because of this we are
		not yet 100 % confident in this code.

		@menu
		* News-3.23.34a::

		* News-3.23.35:: Changes in release 3.23.35
		* News-3.23.34a:: Changes in release 3.23.34a
		* News-3.23.34:: Changes in release 3.23.34
		* News-3.23.33:: Changes in release 3.23.33
		* News-3.23.32:: Changes in release 3.23.32
		@@ -42094,9 +42102,19 @@ not yet 100 % confident in this code.
		* News-3.23.0:: Changes in release 3.23.0
		@end menu

		@node News-3.23.34a, News-3.23.34, News-3.23.x, News-3.23.x
		@node News-3.23.35, News-3.23.34a, News-3.23.x, News-3.23.x
		@appendixsubsec Changes in release 3.23.35
		@itemize @bullet
		@item
		Added SQL_ANSI_MODE. You can now switch to ANSI mode for only your
		connection by running @code{SET SQL_ANSI_MODE=1}, and you can turn
		ANSI mode off with @code{SET SQL_ANSI_MODE=0}.
		@end itemize

		@node News-3.23.34a, News-3.23.34, News-3.23.35, News-3.23.x
		@appendixsubsec Changes in release 3.23.34a
		@itemize @bullet
		@item
		Add extra files to distribution to allow one to compile Innobase.
		@end itemize

sql/gen_lex_hash.cc

+5 −3

Original line number	Diff line number	Diff line
		@@ -254,7 +254,7 @@ you have to change 'main' to print out the new function\n");
		if (write_warning)
		fprintf (stderr,"Fatal error when generating hash for symbols\n\
		Didn't find suitable values for perfect hashing:\n\
		You have to edit gen_lex_hase.cc to generate a new hashing function.\n\
		You have to edit gen_lex_hash.cc to generate a new hashing function.\n\
		You can try running gen_lex_hash with --search to find a suitable value\n\
		Symbol array size = %d\n",function_mod);
		return -1;
		@@ -472,7 +472,9 @@ int main(int argc,char **argv)
		int error;

		MY_INIT(argv[0]);
		start_value=5315771L; best_t1=6916833L; best_t2=3813748L; best_type=3; /* mode=5839 add=5 type: 0 */
		start_value=4934807L; best_t1=5181754L; best_t2=1469522L; best_type=0;
		/* mode=4999 add=7 type: 0 */

		if (get_options(argc,(char **) argv))
		exit(1);

sql/lex.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -270,6 +270,7 @@ static SYMBOL symbols[] = {
		{ "SLAVE", SYM(SLAVE),0,0},
		{ "SMALLINT", SYM(SMALLINT),0,0},
		{ "SONAME", SYM(UDF_SONAME_SYM),0,0},
		{ "SQL_ANSI_MODE", SYM(SQL_ANSI_MODE),0,0},
		{ "SQL_AUTO_IS_NULL", SYM(SQL_AUTO_IS_NULL),0,0},
		{ "SQL_BIG_RESULT", SYM(SQL_BIG_RESULT),0,0},
		{ "SQL_BIG_SELECTS", SYM(SQL_BIG_SELECTS),0,0},

sql/mysql_priv.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -539,6 +539,8 @@ extern struct show_var_st init_vars[];
		extern struct show_var_st status_vars[];
		extern enum db_type default_table_type;

		extern uchar global_state_map[256];

		#ifndef __WIN__
		extern pthread_t signal_thread;
		#endif

sql/sql_class.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -287,6 +287,9 @@ class THD :public ilink {
		ulong slave_proxy_id; // in slave thread we need to know in behalf of which
		// thread the query is being run to replicate temp tables properly

		// thread-specific state map for lex parser
		uchar state_map[256];

		THD();
		~THD();
		bool store_globals();