bk commit into 5.1 tree (anozdrin:1.2206)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.1 repository of alik. When alik 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.2206 06/06/22 18:59:57 anozdrin@alik. +5 -0
  Merge mysql.com:/mnt/raid/alik/MySQL/devel/5.1-tree
  into  mysql.com:/mnt/raid/alik/MySQL/devel/5.1-rt-bug20294

  sql/sql_show.cc
    1.353 06/06/22 18:59:52 anozdrin@alik. +0 -0
    Auto merged

  sql/sql_parse.cc
    1.563 06/06/22 18:59:52 anozdrin@alik. +0 -0
    Auto merged

  sql/mysqld.cc
    1.563 06/06/22 18:59:52 anozdrin@alik. +0 -0
    Auto merged

  sql/mysql_priv.h
    1.413 06/06/22 18:59:52 anozdrin@alik. +0 -0
    Auto merged

  mysql-test/t/disabled.def
    1.169 06/06/22 18:59:52 anozdrin@alik. +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:	anozdrin
# Host:	alik.
# Root:	/mnt/raid/alik/MySQL/devel/5.1-rt-bug20294/RESYNC

--- 1.412/sql/mysql_priv.h	2006-06-22 02:53:31 +04:00
+++ 1.413/sql/mysql_priv.h	2006-06-22 18:59:52 +04:00
@@ -1758,6 +1758,8 @@
 bool calc_time_diff(TIME *l_time1, TIME *l_time2, int l_sign,
                     longlong *seconds_out, long *microseconds_out);
 
+extern LEX_STRING interval_type_to_name[];
+
 extern DATE_TIME_FORMAT *date_time_format_make(timestamp_type format_type,
 					       const char *format_str,
 					       uint format_length);
@@ -1773,6 +1775,7 @@
                String *str);
 void make_time(const DATE_TIME_FORMAT *format, const TIME *l_time,
                String *str);
+int my_time_compare(TIME *a, TIME *b);
 
 int test_if_number(char *str,int *res,bool allow_wildcards);
 void change_byte(byte *,uint,char,char);
@@ -1790,6 +1793,7 @@
 void change_double_for_sort(double nr,byte *to);
 double my_double_round(double value, int dec, bool truncate);
 int get_quick_record(SQL_SELECT *select);
+
 int calc_weekday(long daynr,bool sunday_first_day_of_week);
 uint calc_week(TIME *l_time, uint week_behaviour, uint *year);
 void find_date(char *pos,uint *vek,uint flag);

--- 1.562/sql/mysqld.cc	2006-06-20 20:06:11 +04:00
+++ 1.563/sql/mysqld.cc	2006-06-22 18:59:52 +04:00
@@ -24,7 +24,7 @@
 #include "stacktrace.h"
 #include "mysqld_suffix.h"
 #include "mysys_err.h"
-#include "event.h"
+#include "events.h"
 
 #include "ha_myisam.h"
 

--- 1.562/sql/sql_parse.cc	2006-06-22 03:25:50 +04:00
+++ 1.563/sql/sql_parse.cc	2006-06-22 18:59:52 +04:00
@@ -26,7 +26,8 @@
 #include "sp_head.h"
 #include "sp.h"
 #include "sp_cache.h"
-#include "event.h"
+#include "events.h"
+#include "event_timed.h"
 
 #ifdef HAVE_OPENSSL
 /*

--- 1.352/sql/sql_show.cc	2006-06-20 16:51:24 +04:00
+++ 1.353/sql/sql_show.cc	2006-06-22 18:59:52 +04:00
@@ -26,7 +26,8 @@
 #include "sql_trigger.h"
 #include "authors.h"
 #include "contributors.h"
-#include "event.h"
+#include "events.h"
+#include "event_timed.h"
 #include <my_dir.h>
 
 #ifdef WITH_PARTITION_STORAGE_ENGINE

--- 1.168/mysql-test/t/disabled.def	2006-06-21 15:51:07 +04:00
+++ 1.169/mysql-test/t/disabled.def	2006-06-22 18:59:52 +04:00
@@ -13,9 +13,9 @@
 #events_stress            : BUG#17619 2006-02-21 andrey  Race conditions
 #events                   : BUG#17619 2006-02-21 andrey  Race conditions
 #events_scheduling        : BUG#19170 2006-04-26 andrey  Test case of 19170 fails on some
platforms. Has to be checked.
-im_instance_conf         : Bug#20294 2006-06-06 monty   Instance manager test
im_instance_conf fails randomly
-im_options               : Bug#20294 2006-06-06 monty   Instance manager test
im_instance_conf fails randomly
-im_life_cycle            : Bug#20368 2006-06-10 alik    im_life_cycle test fails
+#im_instance_conf          : Bug#20294 2006-06-06 monty   Instance manager test
im_instance_conf fails randomly
+#im_options                : Bug#20294 2006-06-06 monty   Instance manager test
im_instance_conf fails randomly
+#im_life_cycle             : Bug#20368 2006-06-10 alik    im_life_cycle test fails
 ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 #ndb_binlog_discover      : BUG#19395 2006-04-28 tomas/knielsen mysqld does not always
detect cluster shutdown