Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller 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@stripped, 2007-06-29 15:19:13-04:00, cmiller@stripped +11 -0
mrege cleanup
sql/field.cc@stripped, 2007-06-29 15:01:40-04:00, cmiller@stripped +1 -0
merge cleanup
sql/ha_federated.cc@stripped, 2007-06-29 15:01:40-04:00, cmiller@stripped +1 -1
merge cleanup
sql/ha_ndbcluster.h@stripped, 2007-06-29 15:01:40-04:00, cmiller@stripped +2 -2
merge cleanup
sql/handler.cc@stripped, 2007-06-29 15:01:40-04:00, cmiller@stripped +1 -1
merge cleanup
sql/handler.h@stripped, 2007-06-29 15:01:40-04:00, cmiller@stripped +2 -1
merge cleanup
sql/item.cc@stripped, 2007-06-29 15:01:40-04:00, cmiller@stripped +1 -1
merge cleanup
sql/item_cmpfunc.cc@stripped, 2007-06-29 15:01:40-04:00, cmiller@stripped +1 -20
merge cleanup
sql/item_func.cc@stripped, 2007-06-29 15:01:40-04:00, cmiller@stripped +0 -6
merge cleanup
sql/log_event.cc@stripped, 2007-06-29 15:01:40-04:00, cmiller@stripped +1 -1
merge cleanup
sql/log_event.h@stripped, 2007-06-29 15:01:40-04:00, cmiller@stripped +1 -0
merge cleanup
sql/repl_failsafe.cc@stripped, 2007-06-29 15:01:40-04:00, cmiller@stripped +0 -1
merge cleanup
diff -Nrup a/sql/field.cc b/sql/field.cc
--- a/sql/field.cc 2007-06-28 15:57:29 -04:00
+++ b/sql/field.cc 2007-06-29 15:01:40 -04:00
@@ -965,6 +965,7 @@ static Item_result field_types_result_ty
};
+/*
Test if the given string contains important data:
not spaces for character string,
or any data for binary string.
diff -Nrup a/sql/ha_federated.cc b/sql/ha_federated.cc
--- a/sql/ha_federated.cc 2007-06-28 14:06:29 -04:00
+++ b/sql/ha_federated.cc 2007-06-29 15:01:40 -04:00
@@ -2069,7 +2069,7 @@ error:
/**
Initialized at each key walk (called multiple times unlike rnd_init())
-
+*/
int ha_federated::index_init(uint keynr)
{
diff -Nrup a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
--- a/sql/ha_ndbcluster.h 2007-06-28 15:57:29 -04:00
+++ b/sql/ha_ndbcluster.h 2007-06-29 15:01:40 -04:00
@@ -217,7 +217,7 @@ static void set_tabname(const char *path
Negated conditions are supported by NOT which generate NAND/NOR groups.
@todo Conflicting comment in ha_ndbcluster.cc
- /
+ */
const COND *cond_push(const COND *cond);
/**
@brief Pop the top condition from the condition stack of the handler
@@ -226,7 +226,7 @@ static void set_tabname(const char *path
Pops the top if condition stack, if stack is not empty
@todo Conflicting comment in ha_ndbcluster.cc
- /
+ */
void cond_pop();
uint8 table_cache_type();
diff -Nrup a/sql/handler.cc b/sql/handler.cc
--- a/sql/handler.cc 2007-06-28 15:57:29 -04:00
+++ b/sql/handler.cc 2007-06-29 15:01:40 -04:00
@@ -2492,7 +2492,7 @@ ha_find_files(THD *thd,const char *db,co
HA_ERR_TABLE_EXIST Table exists
@retval
\# Error code
-
+*/
int ha_table_exists_in_engine(THD* thd, const char* db, const char* name)
{
int error= HA_ERR_NO_SUCH_TABLE;
diff -Nrup a/sql/handler.h b/sql/handler.h
--- a/sql/handler.h 2007-06-28 14:06:30 -04:00
+++ b/sql/handler.h 2007-06-29 15:01:40 -04:00
@@ -871,11 +871,12 @@ public:
*engine_callback= 0;
return 1;
}
+
/**
@retval true Primary key (if there is one) is clustered key covering
all fields
@retval false otherwise
- /
+ */
virtual bool primary_key_is_clustered() { return FALSE; }
virtual int cmp_ref(const byte *ref1, const byte *ref2)
diff -Nrup a/sql/item.cc b/sql/item.cc
--- a/sql/item.cc 2007-06-28 15:57:29 -04:00
+++ b/sql/item.cc 2007-06-29 15:01:40 -04:00
@@ -5812,7 +5812,7 @@ int Item_default_value::save_in_field(Fi
/**
This method like the walk method traverses the item tree, but at the
same time it can replace some nodes in the tree.
-
+*/
Item *Item_default_value::transform(Item_transformer transformer, byte *args)
{
diff -Nrup a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
--- a/sql/item_cmpfunc.cc 2007-06-28 15:57:29 -04:00
+++ b/sql/item_cmpfunc.cc 2007-06-29 15:01:40 -04:00
@@ -73,6 +73,7 @@ static void agg_result_type(Item_result
}
+/**
Compare row signature of two expressions
SYNOPSIS:
@@ -109,31 +110,11 @@ static int cmp_row_type(Item* item1, Ite
/**
- Aggregates result types from the array of items.
-
- SYNOPSIS:
- agg_cmp_type()
- thd thread handle
- type [out] the aggregated type
- items array of items to aggregate the type from
- nitems number of items in the array
-
- DESCRIPTION
This function aggregates result types from the array of items. Found type
supposed to be used later for comparison of values of these items.
Aggregation itself is performed by the item_cmp_type() function.
The function also checks compatibility of row signatures for the
submitted items (see the spec for the cmp_row_type function).
-
- RETURN VALUES
- 1 type incompatibility has been detected
- 0 otherwise
-/**
- Aggregates result types from the array of items.
-
- This function aggregates result types from the array of items. Found type
- supposed to be used later for comparison of values of these items.
- Aggregation itself is performed by the item_cmp_type() function.
@param thd thread handle
@param[out] type the aggregated type
diff -Nrup a/sql/item_func.cc b/sql/item_func.cc
--- a/sql/item_func.cc 2007-06-28 15:57:29 -04:00
+++ b/sql/item_func.cc 2007-06-29 15:01:40 -04:00
@@ -5434,12 +5434,6 @@ void Item_func_sp::fix_length_and_dec()
}
/**
- @brief Execute function & store value in field.
-
- @return Function returns error status.
- @retval FALSE on success.
- @retval TRUE if an error occurred.
-/**
Execute function & store value in field.
@retval
diff -Nrup a/sql/log_event.cc b/sql/log_event.cc
--- a/sql/log_event.cc 2007-06-28 15:57:29 -04:00
+++ b/sql/log_event.cc 2007-06-29 15:01:40 -04:00
@@ -1081,7 +1081,7 @@ void Query_log_event::pack_info(Protocol
/**
Utility function for the next method (Query_log_event::write())
-
+*/
static void write_str_with_code_and_len(char **dst, const char *src,
int len, uint code)
{
diff -Nrup a/sql/log_event.h b/sql/log_event.h
--- a/sql/log_event.h 2007-06-28 15:57:29 -04:00
+++ b/sql/log_event.h 2007-06-29 15:01:40 -04:00
@@ -552,6 +552,7 @@ typedef struct st_print_event_info
class Log_event
{
public:
+ /**
The following type definition is to be used whenever data is placed
and manipulated in a common buffer. Use this typedef for buffers
that contain data containing binary and character data.
diff -Nrup a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc
--- a/sql/repl_failsafe.cc 2007-06-28 15:57:30 -04:00
+++ b/sql/repl_failsafe.cc 2007-06-29 15:01:40 -04:00
@@ -23,7 +23,6 @@
functions like register_slave()) are working.
*/
-static int init_failsafe_rpl_thread(THD* thd)
#include "mysql_priv.h"
#ifdef HAVE_REPLICATION
| Thread |
|---|
| • bk commit into 5.0 tree (cmiller:1.2505) | Chad MILLER | 29 Jun |
