Commit a48380cd authored by unknown's avatar unknown
Browse files

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0


client/mysqlimport.c:
  Auto merged
include/config-netware.h:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
netware/mysqld_safe.c:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Merged from 4.1.
sql/sql_base.cc:
  Merged from 4.1.
sql/sql_handler.cc:
  Merged from 4.1.
sql/sql_select.cc:
  Merged from 4.1.
parents 26252fa2 1665d237

include/config-netware.h

+3 −0
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ extern "C" { 
/* On NetWare, stack grows towards lower address*/

#define STACK_DIRECTION -1



/* On NetWare, we need to set stack size for threads, otherwise default 16K is used */

#define NW_THD_STACKSIZE 65536



/* On NetWare, to fix the problem with the deletion of open files */

#define CANT_DELETE_OPEN_FILES 1

innobase/os/os0thread.c

+9 −0
Original line number Diff line number Diff line
@@ -147,6 +147,15 @@ os_thread_create( 
          "InnoDB: Error: pthread_attr_setstacksize returned %d\n", ret);

		 exit(1);

	}

#endif

#ifdef __NETWARE__

	ret = pthread_attr_setstacksize(&attr,

					(size_t) NW_THD_STACKSIZE);

        if (ret) {

	         fprintf(stderr,

          "InnoDB: Error: pthread_attr_setstacksize returned %d\n", ret);

		 exit(1);

	}

#endif

	os_mutex_enter(os_sync_mutex);

	os_thread_count++;

sql/mysqld.cc

+5 −0
Original line number Diff line number Diff line
@@ -3322,6 +3322,11 @@ int main(int argc, char **argv) 
    }

  }

#endif

#ifdef __NETWARE__

  /* Increasing stacksize of threads on NetWare */

  

  pthread_attr_setstacksize(&connection_attrib, NW_THD_STACKSIZE);

#endif



  (void) thr_setconcurrency(concurrency);	// 10 by default

sql/sql_base.cc

+16 −4
Original line number Diff line number Diff line
@@ -1388,10 +1388,20 @@ TABLE *find_locked_table(THD *thd, const char *db,const char *table_name) 




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

** Reopen an table because the definition has changed. The date file for the

** table is already closed.

** Returns 0 if ok.

** If table can't be reopened, the entry is unchanged.

  Reopen an table because the definition has changed. The date file for the

  table is already closed.



  SYNOPSIS

    reopen_table()

    table		Table to be opened

    locked		1 if we have already a lock on LOCK_open



  NOTES

    table->query_id will be 0 if table was reopened



  RETURN

    0  ok

    1  error ('table' is unchanged if table couldn't be reopened)

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



bool reopen_table(TABLE *table,bool locked)
@@ -1464,8 +1474,10 @@ bool reopen_table(TABLE *table,bool locked) 
    (*field)->table_name= &table->alias;

  }

  for (key=0 ; key < table->s->keys ; key++)

  {

    for (part=0 ; part < table->key_info[key].usable_key_parts ; part++)

      table->key_info[key].key_part[part].field->table= table;

  }

  if (table->triggers)

    table->triggers->set_table(table);

sql/sql_handler.cc

+7 −1
Original line number Diff line number Diff line
@@ -423,7 +423,13 @@ bool mysql_ha_read(THD *thd, TABLE_LIST *tables, 


  if (cond && ((!cond->fixed &&

                cond->fix_fields(thd, &cond)) || cond->check_cols(1)))

  {

    if (table->query_id != thd->query_id)

      cond->cleanup();                          // File was reopened

    if ((!cond->fixed &&

	 cond->fix_fields(thd, tables, &cond)) || cond->check_cols(1))

      goto err0;

  }



  if (keyname)

  {