List:Commits« Previous MessageNext Message »
From:knielsen Date:January 30 2006 4:57pm
Subject:bk commit into 5.1 tree (knielsen:1.2098)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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.2098 06/01/30 17:57:20 knielsen@stripped +8 -0
  Merge mysql.com:/usr/local/mysql/mysql-5.1-win-fixes
  into  mysql.com:/usr/local/mysql/x/mysql-5.1-new

  VC++Files/client/mysqldump.vcproj
    1.3 06/01/30 17:56:58 knielsen@stripped +0 -27
    Manual merge.

  sql/sql_partition.cc
    1.29 06/01/30 17:54:12 knielsen@stripped +0 -0
    Auto merged

  sql/opt_range.cc
    1.198 06/01/30 17:54:12 knielsen@stripped +0 -0
    Auto merged

  sql/handler.h
    1.184 06/01/30 17:54:11 knielsen@stripped +0 -0
    Auto merged

  sql/event_timed.cc
    1.24 06/01/30 17:54:11 knielsen@stripped +0 -0
    Auto merged

  sql/event_executor.cc
    1.22 06/01/30 17:54:11 knielsen@stripped +0 -0
    Auto merged

  sql/event.h
    1.16 06/01/30 17:54:11 knielsen@stripped +0 -0
    Auto merged

  VC++Files/sql/mysqld.vcproj
    1.9 06/01/30 17:54:11 knielsen@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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/x/mysql-5.1-new/RESYNC

--- 1.183/sql/handler.h	2006-01-29 09:53:09 +01:00
+++ 1.184/sql/handler.h	2006-01-30 17:54:11 +01:00
@@ -794,7 +794,7 @@
 
 typedef int (*get_partitions_in_range_iter)(partition_info *part_info,
                                             bool is_subpart,
-                                            byte *min_val, byte *max_val,
+                                            char *min_val, char *max_val,
                                             uint flags,
                                             PARTITION_ITERATOR *part_iter);
 

--- 1.197/sql/opt_range.cc	2006-01-29 01:22:28 +01:00
+++ 1.198/sql/opt_range.cc	2006-01-30 17:54:12 +01:00
@@ -338,8 +338,8 @@
     */
     if (min_flag || max_flag)
       return FALSE;
-    byte *min_val= min_value;
-    byte *max_val= min_value;
+    byte *min_val= (byte *)min_value;
+    byte *max_val= (byte *)min_value;
 
     if (maybe_null)
     {

--- 1.15/sql/event.h	2006-01-30 13:09:02 +01:00
+++ 1.16/sql/event.h	2006-01-30 17:54:11 +01:00
@@ -54,6 +54,25 @@
   MYSQL_EVENT_DISABLED
 };
 
+enum evex_table_field
+{
+  EVEX_FIELD_DB = 0,
+  EVEX_FIELD_NAME,
+  EVEX_FIELD_BODY,
+  EVEX_FIELD_DEFINER,
+  EVEX_FIELD_EXECUTE_AT,  
+  EVEX_FIELD_INTERVAL_EXPR,  
+  EVEX_FIELD_TRANSIENT_INTERVAL,  
+  EVEX_FIELD_CREATED,
+  EVEX_FIELD_MODIFIED,
+  EVEX_FIELD_LAST_EXECUTED,
+  EVEX_FIELD_STARTS,
+  EVEX_FIELD_ENDS,
+  EVEX_FIELD_STATUS,
+  EVEX_FIELD_ON_COMPLETION,
+  EVEX_FIELD_COMMENT,
+  EVEX_FIELD_COUNT /* a cool trick to count the number of fields :) */
+} ;
 
 class event_timed
 {
@@ -64,9 +83,10 @@
 
   bool status_changed;
   bool last_executed_changed;
-  TIME last_executed;
 
 public:
+  TIME last_executed;
+
   LEX_STRING dbname;
   LEX_STRING name;
   LEX_STRING body;
@@ -83,8 +103,8 @@
   longlong expression;
   interval_type interval;
 
-  longlong created;
-  longlong modified;
+  ulonglong created;
+  ulonglong modified;
   enum enum_event_on_completion on_completion;
   enum enum_event_status status;
   sp_head *sphead;
@@ -197,6 +217,10 @@
 evex_drop_event(THD *thd, event_timed *et, bool drop_if_exists,
                 uint *rows_affected);
 
+int
+evex_open_event_table(THD *thd, enum thr_lock_type lock_type, TABLE **table);
+
+int sortcmp_lex_string(LEX_STRING s, LEX_STRING t, CHARSET_INFO *cs);
 
 int
 init_events();
@@ -210,6 +234,7 @@
 event_timed_compare(event_timed **a, event_timed **b);
 
 
+
 /*
 CREATE TABLE event (
   db char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
@@ -233,7 +258,7 @@
   status ENUM('ENABLED','DISABLED') NOT NULL default 'ENABLED',
   on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP',
   comment varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
-  PRIMARY KEY  (db,name)
+  PRIMARY KEY  (definer,db,name)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';
 */
 

--- 1.21/sql/event_executor.cc	2006-01-30 13:09:02 +01:00
+++ 1.22/sql/event_executor.cc	2006-01-30 17:54:11 +01:00
@@ -348,7 +348,8 @@
                                TIME_to_ulonglong_datetime(&et->execute_at)));
 
       et->update_fields(thd);
-      DBUG_PRINT("info", ("  Spawning a thread %d", ++iter_num));
+      ++iter_num;
+      DBUG_PRINT("info", ("  Spawning a thread %d", iter_num));
 #ifndef DBUG_FAULTY_THR
       if (pthread_create(&th, NULL, event_executor_worker, (void*)et))
       {
@@ -461,7 +462,7 @@
   thd->mem_root= &worker_mem_root;
 
   pthread_detach_this_thread();
-
+  
   if (init_event_thread(thd))
     goto err;
 

--- 1.23/sql/event_timed.cc	2006-01-30 17:11:42 +01:00
+++ 1.24/sql/event_timed.cc	2006-01-30 17:54:11 +01:00
@@ -952,7 +952,7 @@
 
 
 char *
-event_timed::get_show_create_event(THD *thd, uint *length)
+event_timed::get_show_create_event(THD *thd, uint32 *length)
 {
   char *dst, *ret;
   uint len, tmp_len;

--- 1.2/VC++Files/client/mysqldump.vcproj	2006-01-16 09:55:46 +01:00
+++ 1.3/VC++Files/client/mysqldump.vcproj	2006-01-30 17:56:58 +01:00
@@ -227,7 +227,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="my_user.c">
+			RelativePath="..\sql-common\my_user.c">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool

--- 1.8/VC++Files/sql/mysqld.vcproj	2006-01-30 13:09:01 +01:00
+++ 1.9/VC++Files/sql/mysqld.vcproj	2006-01-30 17:54:11 +01:00
@@ -3925,6 +3925,81 @@
 			</FileConfiguration>
 		</File>
 		<File
+			RelativePath="my_user.c">
+			<FileConfiguration
+				Name="classic nt|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Max|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Max nt|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="nt|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="pro nt|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="pro|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="classic|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+		</File>
+		<File
 			RelativePath="..\storage\myisammrg\myrg_rnext_same.c">
 			<FileConfiguration
 				Name="classic nt|Win32">

--- 1.28/sql/sql_partition.cc	2006-01-29 01:22:28 +01:00
+++ 1.29/sql/sql_partition.cc	2006-01-30 17:54:12 +01:00
@@ -116,12 +116,12 @@
 uint32 get_next_partition_id_list(PARTITION_ITERATOR* part_iter);
 int get_part_iter_for_interval_via_mapping(partition_info *part_info,
                                            bool is_subpart,
-                                           byte *min_value, byte *max_value,
+                                           char *min_value, char *max_value,
                                            uint flags,
                                            PARTITION_ITERATOR *part_iter);
 int get_part_iter_for_interval_via_walking(partition_info *part_info,
                                            bool is_subpart,
-                                           byte *min_value, byte *max_value,
+                                           char *min_value, char *max_value,
                                            uint flags,
                                            PARTITION_ITERATOR *part_iter);
 static void set_up_range_analysis_info(partition_info *part_info);
@@ -5729,7 +5729,7 @@
 
 int get_part_iter_for_interval_via_mapping(partition_info *part_info,
                                            bool is_subpart,
-                                           byte *min_value, byte *max_value,
+                                           char *min_value, char *max_value,
                                            uint flags,
                                            PARTITION_ITERATOR *part_iter)
 {
@@ -5845,7 +5845,7 @@
 
 int get_part_iter_for_interval_via_walking(partition_info *part_info,
                                            bool is_subpart,
-                                           byte *min_value, byte *max_value,
+                                           char *min_value, char *max_value,
                                            uint flags,
                                            PARTITION_ITERATOR *part_iter)
 {
Thread
bk commit into 5.1 tree (knielsen:1.2098)knielsen30 Jan