List:Commits« Previous MessageNext Message »
From:Sergei Golubchik Date:January 4 2006 9:37am
Subject:bk commit into 5.1 tree (serg:1.2019)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of serg. When serg 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.2019 06/01/04 10:36:49 serg@stripped +5 -0
  cleanup

  sql/sql_parse.cc
    1.503 06/01/04 10:36:34 serg@stripped +7 -10
    don't call add_to_status/bzero in a loop

  scripts/mysql_create_system_tables.sh
    1.26 06/01/04 10:36:34 serg@stripped +4 -4
    remove obsolete syntax (and warnings)

  plugin/fulltext/Makefile.am
    1.2 06/01/04 10:36:34 serg@stripped +3 -3
    no lib prefix for modules. really build .so

  mysys/my_once.c
    1.9 06/01/04 10:36:34 serg@stripped +2 -0
    MY_ZEROFILL support in my_once_alloc

  include/my_sys.h
    1.184 06/01/04 10:36:34 serg@stripped +2 -1
    sort_dynamic()

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.1

--- 1.183/include/my_sys.h	Sat Dec 31 05:48:11 2005
+++ 1.184/include/my_sys.h	Wed Jan  4 10:36:34 2006
@@ -755,8 +755,9 @@ extern void delete_dynamic_element(DYNAM
 extern void freeze_size(DYNAMIC_ARRAY *array);
 #define dynamic_array_ptr(array,array_index) ((array)->buffer+(array_index)*(array)->size_of_element)
 #define dynamic_element(array,array_index,type) ((type)((array)->buffer) +(array_index))
-#define push_dynamic(A,B) insert_dynamic(A,B)
+#define push_dynamic(A,B) insert_dynamic((A),(B))
 #define reset_dynamic(array) ((array)->elements= 0)
+#define sort_dynamic(A,cmp) qsort((A)->buffer, (A)->elements, (A)->size_of_element, (cmp))
 
 extern my_bool init_dynamic_string(DYNAMIC_STRING *str, const char *init_str,
 				   uint init_alloc,uint alloc_increment);

--- 1.8/mysys/my_once.c	Mon Jun 13 12:41:07 2005
+++ 1.9/mysys/my_once.c	Wed Jan  4 10:36:34 2006
@@ -75,6 +75,8 @@ gptr my_once_alloc(unsigned int Size, my
   point= (gptr) ((char*) next+ (next->size-next->left));
   next->left-= Size;
 
+  if (MyFlags & MY_ZEROFILL)
+    bzero(point, Size);
   return(point);
 } /* my_once_alloc */
 

--- 1.502/sql/sql_parse.cc	Wed Dec 28 17:47:55 2005
+++ 1.503/sql/sql_parse.cc	Wed Jan  4 10:36:34 2006
@@ -6642,17 +6642,14 @@ static void refresh_status(void)
 {
   pthread_mutex_lock(&LOCK_status);
   for (struct show_var_st *ptr=status_vars; ptr->name; ptr++)
-  {
-    if (ptr->type == SHOW_LONG)
+    if (ptr->type == SHOW_LONG) // note that SHOW_LONG_NOFLUSH variables are not reset
       *(ulong*) ptr->value= 0;
-    else if (ptr->type == SHOW_LONG_STATUS)
-    {
-      THD *thd= current_thd;
-      /* We must update the global status before cleaning up the thread */
-      add_to_status(&global_status_var, &thd->status_var);
-      bzero((char*) &thd->status_var, sizeof(thd->status_var));
-    }
-  }
+
+  /* We must update the global status before cleaning up the thread */
+  THD *thd= current_thd;
+  add_to_status(&global_status_var, &thd->status_var);
+  bzero((char*) &thd->status_var, sizeof(thd->status_var));
+
   /* Reset the counters of all key caches (default and named). */
   process_key_caches(reset_key_cache_counters);
   pthread_mutex_unlock(&LOCK_status);

--- 1.1/plugin/fulltext/Makefile.am	Wed Dec 28 13:05:21 2005
+++ 1.2/plugin/fulltext/Makefile.am	Wed Jan  4 10:36:34 2006
@@ -1,4 +1,4 @@
 INCLUDES= -I$(top_builddir)/include
-noinst_LTLIBRARIES= libmypluglib.la
-libmypluglib_la_SOURCES= plugin_example.c
-libmypluglib_la_LDFLAGS= -module
+noinst_LTLIBRARIES= mypluglib.la
+mypluglib_la_SOURCES= plugin_example.c
+mypluglib_la_LDFLAGS= -module -rpath $(pkglibdir)

--- 1.25/scripts/mysql_create_system_tables.sh	Sun Nov  6 13:12:48 2005
+++ 1.26/scripts/mysql_create_system_tables.sh	Wed Jan  4 10:36:34 2006
@@ -229,7 +229,7 @@ then
   c_t="$c_t   User char(16) binary DEFAULT '' NOT NULL,"
   c_t="$c_t   Table_name char(64) binary DEFAULT '' NOT NULL,"
   c_t="$c_t   Grantor char(77) DEFAULT '' NOT NULL,"
-  c_t="$c_t   Timestamp timestamp(14),"
+  c_t="$c_t   Timestamp timestamp,"
   c_t="$c_t   Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view') COLLATE utf8_general_ci DEFAULT '' NOT NULL,"
   c_t="$c_t   Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL,"
   c_t="$c_t   PRIMARY KEY (Host,Db,User,Table_name),"
@@ -251,7 +251,7 @@ then
   c_c="$c_c   User char(16) binary DEFAULT '' NOT NULL,"
   c_c="$c_c   Table_name char(64) binary DEFAULT '' NOT NULL,"
   c_c="$c_c   Column_name char(64) binary DEFAULT '' NOT NULL,"
-  c_c="$c_c   Timestamp timestamp(14),"
+  c_c="$c_c   Timestamp timestamp,"
   c_c="$c_c   Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL,"
   c_c="$c_c   PRIMARY KEY (Host,Db,User,Table_name,Column_name)"
   c_c="$c_c ) engine=MyISAM"
@@ -273,7 +273,7 @@ then
   c_pp="$c_pp   Routine_type enum('FUNCTION','PROCEDURE') NOT NULL,"
   c_pp="$c_pp   Grantor char(77) DEFAULT '' NOT NULL,"
   c_pp="$c_pp   Proc_priv set('Execute','Alter Routine','Grant') COLLATE utf8_general_ci DEFAULT '' NOT NULL,"
-  c_pp="$c_pp   Timestamp timestamp(14),"
+  c_pp="$c_pp   Timestamp timestamp,"
   c_pp="$c_pp   PRIMARY KEY (Host,Db,User,Routine_name,Routine_type),"
   c_pp="$c_pp   KEY Grantor (Grantor)"
   c_pp="$c_pp ) engine=MyISAM"
@@ -743,7 +743,7 @@ fi
 
 cat << END_OF_DATA
 use mysql;
-set table_type=myisam;
+set storage_engine=myisam;
 $c_d
 $i_d
 
Thread
bk commit into 5.1 tree (serg:1.2019)Sergei Golubchik4 Jan