Commit cc445563 authored by unknown's avatar unknown
Browse files

Merge 


innobase/include/srv0srv.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
mysql-test/r/myisam.result:
  SCCS merged
mysql-test/t/myisam.test:
  SCCS merged
sql/ha_innodb.h:
  SCCS merged
parents c4409a7c 26f75ffc

innobase/include/srv0srv.h

+2 −4
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ extern ulint* srv_data_file_is_raw_partition; 


extern ibool	srv_auto_extend_last_data_file;

extern ulint	srv_last_file_size_max;

extern ulint	srv_auto_extend_increment;

extern ulong	srv_auto_extend_increment;



extern ibool	srv_created_new_raw;
@@ -112,11 +112,9 @@ extern ibool srv_use_checksums; 
extern ibool    srv_set_thread_priorities;

extern int      srv_query_thread_priority;



extern ulint	srv_max_purge_lag;

extern ulong	srv_max_purge_lag;

extern ibool	srv_use_awe;

extern ibool	srv_use_adaptive_hash_indexes;



extern ulint	srv_max_purge_lag;

/*-------------------------------------------*/



extern ulint	srv_n_rows_inserted;

innobase/srv/srv0srv.c

+3 −4
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ ulint srv_last_file_size_max = 0; /* if != 0, this tells 
						 the max size auto-extending

						 may increase the last data

						 file size */

ulint	srv_auto_extend_increment = 8;		 /* If the last data file is

ulong	srv_auto_extend_increment = 8;		 /* If the last data file is

						 auto-extended, we add this

						 many pages to it at a time */

ulint*  srv_data_file_is_raw_partition = NULL;
@@ -323,9 +323,6 @@ disable adaptive hash indexes */ 
ibool	srv_use_awe			= FALSE;

ibool	srv_use_adaptive_hash_indexes 	= TRUE;



/* Maximum allowable purge history length.  <=0 means 'infinite'. */

ulint	srv_max_purge_lag		= 0;



/*-------------------------------------------*/

ulint	srv_n_spin_wait_rounds	= 20;

ulint srv_n_free_tickets_to_enter = 500;
@@ -972,6 +969,8 @@ srv_general_init(void) 


/*======================= InnoDB Server FIFO queue =======================*/



/* Maximum allowable purge history length.  <=0 means 'infinite'. */

ulong	srv_max_purge_lag		= 0;



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

Puts an OS thread to wait if there are too many concurrent threads

myisam/mi_create.c

+15 −0
Original line number Diff line number Diff line
@@ -558,6 +558,21 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 
    create_flag=MY_DELETE_OLD;

  }



  /*

    If a MRG_MyISAM table is in use, the mapped MyISAM tables are open,

    but no entry is made in the table cache for them.

    A TRUNCATE command checks for the table in the cache only and could

    be fooled to believe, the table is not open.

    Pull the emergency brake in this situation. (Bug #8306)

  */

  if (test_if_reopen(filename))

  {

    my_printf_error(0, "MyISAM table '%s' is in use "

                    "(most likely by a MERGE table). Try FLUSH TABLES.",

                    MYF(0), name + dirname_length(name));

    goto err;

  }



  if ((file= my_create_with_symlink(linkname_ptr,

				    filename,

				    0, O_RDWR | O_TRUNC,

myisam/mi_open.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ if (pos > end_pos) \ 
** In MySQL the server will handle version issues.

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



static MI_INFO *test_if_reopen(char *filename)

MI_INFO *test_if_reopen(char *filename)

{

  LIST *pos;

myisam/myisamdef.h

+1 −0
Original line number Diff line number Diff line
@@ -708,6 +708,7 @@ void mi_copy_status(void* to,void *from); 
my_bool mi_check_status(void* param);

void mi_disable_non_unique_index(MI_INFO *info, ha_rows rows);



extern MI_INFO *test_if_reopen(char *filename);

my_bool check_table_is_closed(const char *name, const char *where);

int mi_open_datafile(MI_INFO *info, MYISAM_SHARE *share, File file_to_dup);

int mi_open_keyfile(MYISAM_SHARE *share);