Commit d7729a85 authored by unknown's avatar unknown
Browse files

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
parents f2db7d57 190227dc

sql/ha_innodb.cc

+9 −11
Original line number Diff line number Diff line
@@ -1505,17 +1505,14 @@ innobase_close_connection( 
*****************************************************************************/



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

This function is not relevant since we store the tables and indexes

into our own tablespace, not as files, whose extension this function would

give. */

Gives the file extension of an InnoDB single-table tablespace. */



const char**

ha_innobase::bas_ext() const

/*========================*/

				/* out: file extension strings, currently not

				used */

				/* out: file extension string */

{

	static const char* ext[] = {".InnoDB", NullS};

	static const char* ext[] = {".ibd", NullS};



	return(ext);

}
@@ -2390,8 +2387,9 @@ ha_innobase::write_row( 
		same SQL statement! */



		if (auto_inc == 0 && user_thd->next_insert_id != 0) {

		        auto_inc = user_thd->next_insert_id;

		        auto_inc_counter_for_this_stat = auto_inc;



		        auto_inc_counter_for_this_stat

						= user_thd->next_insert_id;

		}



		if (auto_inc == 0 && auto_inc_counter_for_this_stat) {
@@ -2399,14 +2397,14 @@ ha_innobase::write_row( 
			this SQL statement with SET INSERT_ID. We must

			assign sequential values from the counter. */



			auto_inc_counter_for_this_stat++;

			incremented_auto_inc_for_stat = TRUE;



			auto_inc = auto_inc_counter_for_this_stat;



			/* We give MySQL a new value to place in the

			auto-inc column */

			user_thd->next_insert_id = auto_inc;



			auto_inc_counter_for_this_stat++;

			incremented_auto_inc_for_stat = TRUE;

		}



		if (auto_inc != 0) {

sql/item_func.cc

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ Item_func::Item_func(THD *thd, Item_func *item) 
    Sets as a side effect the following class variables:

      maybe_null	Set if any argument may return NULL

      with_sum_func	Set if any of the arguments contains a sum function

      used_table_cache  Set to union of the arguments used table

      used_tables_cache Set to union of the tables used by arguments



      str_value.charset If this is a string function, set this to the

			character set for the first argument.