List:Commits« Previous MessageNext Message »
From:jani Date:January 12 2006 6:28pm
Subject:bk commit into 5.0 tree (jani:1.2044)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2044 06/01/12 20:28:23 jani@stripped +9 -0
  Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
  into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

  sql/sql_select.cc
    1.383 06/01/12 20:28:18 jani@stripped +2 -4
    Merged from 4.1.

  sql/sql_handler.cc
    1.79 06/01/12 20:28:18 jani@stripped +3 -12
    Merged from 4.1.

  sql/sql_base.cc
    1.324 06/01/12 20:28:18 jani@stripped +1 -1
    Merged from 4.1.

  sql/mysqld.cc
    1.529 06/01/12 20:28:18 jani@stripped +0 -1
    Merged from 4.1.

  sql/item_cmpfunc.cc
    1.188 06/01/12 20:07:03 jani@stripped +0 -0
    Auto merged

  netware/mysqld_safe.c
    1.10 06/01/12 20:07:03 jani@stripped +0 -0
    Auto merged

  innobase/os/os0thread.c
    1.29 06/01/12 20:07:03 jani@stripped +0 -0
    Auto merged

  include/config-netware.h
    1.14 06/01/12 20:07:03 jani@stripped +0 -0
    Auto merged

  client/mysqlimport.c
    1.58 06/01/12 20:07:03 jani@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	ua141d10.elisa.omakaista.fi
# Root:	/home/my/bk/mysql-5.0/RESYNC

--- 1.528/sql/mysqld.cc	2006-01-06 01:08:45 +02:00
+++ 1.529/sql/mysqld.cc	2006-01-12 20:28:18 +02:00
@@ -3322,6 +3322,11 @@
     }
   }
 #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
 

--- 1.323/sql/sql_base.cc	2006-01-06 00:49:24 +02:00
+++ 1.324/sql/sql_base.cc	2006-01-12 20:28:18 +02:00
@@ -1388,10 +1388,20 @@
 
 
 /****************************************************************************
-** 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 @@
     (*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);
 

--- 1.382/sql/sql_select.cc	2006-01-12 10:11:10 +02:00
+++ 1.383/sql/sql_select.cc	2006-01-12 20:28:18 +02:00
@@ -8614,6 +8614,11 @@
         have null
       */
       hidden_null_count=null_count;
+      /*
+	We need to update hidden_field_count as we may have stored group
+	functions with constant arguments
+      */
+      param->hidden_field_count= (uint) (reg_field - table->field);
       null_count= 0;
     }
   }
@@ -8833,7 +8838,7 @@
     }
   }
 
-  if (distinct)
+  if (distinct && field_count != param->hidden_field_count)
   {
     /*
       Create an unique key or an unique constraint over all columns

--- 1.28/innobase/os/os0thread.c	2005-03-09 14:37:14 +02:00
+++ 1.29/innobase/os/os0thread.c	2006-01-12 20:07:03 +02:00
@@ -148,6 +148,15 @@
 		 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++;
 	os_mutex_exit(os_sync_mutex);

--- 1.13/include/config-netware.h	2005-12-24 15:32:38 +02:00
+++ 1.14/include/config-netware.h	2006-01-12 20:07:03 +02:00
@@ -95,6 +95,9 @@
 /* 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
 

--- 1.78/sql/sql_handler.cc	2006-01-06 12:48:09 +02:00
+++ 1.79/sql/sql_handler.cc	2006-01-12 20:28:18 +02:00
@@ -423,7 +423,13 @@
 
   if (cond && ((!cond->fixed &&
                 cond->fix_fields(thd, &cond)) || cond->check_cols(1)))
-    goto err0;
+  {
+    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)
   {
Thread
bk commit into 5.0 tree (jani:1.2044)jani12 Jan