Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base (d7a7f2f1) · Commits · Software / OSDI20 Artifacts / mariadb

sql/mysqld.cc

+12 −2

Original line number	Diff line number	Diff line
		@@ -2502,7 +2502,12 @@ static int my_message_sql(uint error, const char *str, myf MyFlags)
		thd->query_error= 1; // needed to catch query errors during replication

		if (!thd->no_warnings_for_error)
		{
		thd->no_warnings_for_error= TRUE;
		push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, error, str);
		thd->no_warnings_for_error= FALSE;
		}

		/*
		thd->lex->current_select == 0 if lex structure is not inited
		(not query command (COM_QUERY))
		@@ -4308,7 +4313,12 @@ pthread_handler_t handle_connections_sockets(void *arg __attribute__((unused)))
		sock == unix_sock ? VIO_LOCALHOST: 0)) \|\|
		my_net_init(&thd->net,vio_tmp))
		{
		if (vio_tmp)
		/*
		Only delete the temporary vio if we didn't already attach it to the
		NET object. The destructor in THD will delete any initialized net
		structure.
		*/
		if (vio_tmp && thd->net.vio != vio_tmp)
		vio_delete(vio_tmp);
		else
		{

sql/sp_head.cc

+30 −8

Original line number	Diff line number	Diff line
		@@ -436,14 +436,16 @@ check_routine_name(LEX_STRING ident)
		*/

		void *
		sp_head::operator new(size_t size)
		sp_head::operator new(size_t size) throw()
		{
		DBUG_ENTER("sp_head::operator new");
		MEM_ROOT own_root;
		sp_head *sp;

		init_alloc_root(&own_root, MEM_ROOT_BLOCK_SIZE, MEM_ROOT_PREALLOC);
		init_sql_alloc(&own_root, MEM_ROOT_BLOCK_SIZE, MEM_ROOT_PREALLOC);
		sp= (sp_head *) alloc_root(&own_root, size);
		if (sp == NULL)
		return NULL;
		sp->main_mem_root= own_root;
		DBUG_PRINT("info", ("mem_root 0x%lx", (ulong) &sp->mem_root));
		DBUG_RETURN(sp);
		@@ -454,6 +456,10 @@ sp_head::operator delete(void *ptr, size_t size)
		{
		DBUG_ENTER("sp_head::operator delete");
		MEM_ROOT own_root;

		if (ptr == NULL)
		DBUG_VOID_RETURN;

		sp_head sp= (sp_head ) ptr;

		/* Make a copy of main_mem_root as free_root will free the sp */
		@@ -497,6 +503,9 @@ sp_head::init(LEX *lex)

		lex->spcont= m_pcont= new sp_pcontext();

		if (!lex->spcont)
		DBUG_VOID_RETURN;

		/*
		Altough trg_table_fields list is used only in triggers we init for all
		types of stored procedures to simplify reset_lex()/restore_lex() code.
		@@ -998,7 +1007,7 @@ sp_head::execute(THD *thd)
		DBUG_RETURN(TRUE);

		/* init per-instruction memroot */
		init_alloc_root(&execute_mem_root, MEM_ROOT_BLOCK_SIZE, 0);
		init_sql_alloc(&execute_mem_root, MEM_ROOT_BLOCK_SIZE, 0);

		DBUG_ASSERT(!(m_flags & IS_INVOKED));
		m_flags\|= IS_INVOKED;
		@@ -1820,16 +1829,29 @@ sp_head::execute_procedure(THD thd, List<Item> args)
		}


		// Reset lex during parsing, before we parse a sub statement.
		void
		/**
		@brief Reset lex during parsing, before we parse a sub statement.

		@param thd Thread handler.

		@return Error state
		@retval true An error occurred.
		@retval false Success.
		*/

		bool
		sp_head::reset_lex(THD *thd)
		{
		DBUG_ENTER("sp_head::reset_lex");
		LEX *sublex;
		LEX *oldlex= thd->lex;

		sublex= new (thd->mem_root)st_lex_local;
		if (sublex == 0)
		DBUG_RETURN(TRUE);

		thd->lex= sublex;
		(void)m_lex.push_front(oldlex);
		thd->lex= sublex= new st_lex;

		/* Reset most stuff. */
		lex_start(thd);
		@@ -1852,7 +1874,7 @@ sp_head::reset_lex(THD *thd)
		sublex->interval_list.empty();
		sublex->type= 0;

		DBUG_VOID_RETURN;
		DBUG_RETURN(FALSE);
		}

		// Restore lex during parsing, after we have parsed a sub statement.
		@@ -3728,7 +3750,7 @@ sp_add_to_query_tables(THD thd, LEX lex,

		if (!(table= (TABLE_LIST *)thd->calloc(sizeof(TABLE_LIST))))
		{
		my_error(ER_OUTOFMEMORY, MYF(0), sizeof(TABLE_LIST));
		thd->fatal_error();
		return NULL;
		}
		table->db_length= strlen(db);

sql/sp_head.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -182,10 +182,10 @@ class sp_head :private Query_arena
		Security_context m_security_ctx;

		static void *
		operator new(size_t size);
		operator new(size_t size) throw ();

		static void
		operator delete(void *ptr, size_t size);
		operator delete(void *ptr, size_t size) throw ();

		sp_head();

		@@ -245,7 +245,7 @@ class sp_head :private Query_arena
		}

		// Resets lex in 'thd' and keeps a copy of the old one.
		void
		bool
		reset_lex(THD *thd);

		// Restores lex in 'thd' from our copy, but keeps some status from the

sql/sql_base.cc

+1 −2

Original line number	Diff line number	Diff line
		@@ -80,7 +80,6 @@ bool Prelock_error_handler::safely_trapped_errors()
		return ((m_handled_errors > 0) && (m_unhandled_errors == 0));
		}


		TABLE unused_tables; / Used by mysql_test */
		HASH open_cache; /* Used by mysql_test */

		@@ -2653,7 +2652,7 @@ int open_tables(THD thd, TABLE_LIST start, uint counter, uint flags)
		temporary mem_root for new .frm parsing.
		TODO: variables for size
		*/
		init_alloc_root(&new_frm_mem, 8024, 8024);
		init_sql_alloc(&new_frm_mem, 8024, 8024);

		thd->current_tablenr= 0;
		restart:

sql/sql_lex.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -1283,11 +1283,11 @@ typedef struct st_lex : public Query_tables_list

		struct st_lex_local: public st_lex
		{
		static void *operator new(size_t size)
		static void *operator new(size_t size) throw()
		{
		return (void*) sql_alloc((uint) size);
		}
		static void operator new(size_t size, MEM_ROOT mem_root)
		static void operator new(size_t size, MEM_ROOT mem_root) throw()
		{
		return (void*) alloc_root(mem_root, (uint) size);
		}
		@@ -1303,3 +1303,4 @@ extern void lex_start(THD *thd);
		extern void lex_end(LEX *lex);
		extern int MYSQLlex(void arg, void yythd);
		extern char skip_rear_comments(CHARSET_INFO cs, char begin, char end);