Commit 50abf1e4 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into serg.mylan:/usr/home/serg/Abk/mysql-5.1


sql/handler.h:
  Auto merged
parents 167e534c 3b476a8f

include/plugin.h

+10 −10
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ struct st_mysql_plugin 
  const char *descr;    /* general descriptive text (for SHOW PLUGINS ) */

  int (*init)(void);    /* the function to invoke when plugin is loaded */

  int (*deinit)(void);  /* the function to invoke when plugin is unloaded */

  uint version;         /* plugin version (for SHOW PLUGINS)            */

  unsigned int version; /* plugin version (for SHOW PLUGINS)            */

  struct st_mysql_show_var *status_vars;

};
@@ -176,11 +176,11 @@ typedef struct st_mysql_ftparser_boolean_info 
  enum enum_ft_token_type type;

  int yesno;

  int weight_adjust;

  bool wasign;

  bool trunc;

  char wasign;

  char trunc;

  /* These are parser state and must be removed. */

  byte prev;

  byte *quot;

  char prev;

  char *quot;

} MYSQL_FTPARSER_BOOLEAN_INFO;
@@ -224,14 +224,14 @@ typedef struct st_mysql_ftparser_boolean_info 


typedef struct st_mysql_ftparser_param

{

  int (*mysql_parse)(void *param, byte *doc, uint doc_len);

  int (*mysql_add_word)(void *param, byte *word, uint word_len,

  int (*mysql_parse)(void *param, char *doc, int doc_len);

  int (*mysql_add_word)(void *param, char *word, int word_len,

                        MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info);

  void *ftparser_state;

  void *mysql_ftparam;

  CHARSET_INFO *cs;

  byte *doc;

  uint length;

  struct charset_info_st *cs;

  char *doc;

  int length;

  int mode;

} MYSQL_FTPARSER_PARAM;

libmysqld/lib_sql.cc

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ C_MODE_START 


static my_bool emb_read_query_result(MYSQL *mysql);



C_MODE_END



void THD::clear_data_list()

{

  while (first_data)
@@ -59,6 +61,7 @@ void THD::clear_data_list() 
  cur_data= 0;

}



C_MODE_START



/*

  Reads error information from the MYSQL_DATA and puts

plugin/fulltext/plugin_example.c

+3 −4
Original line number Diff line number Diff line
@@ -13,9 +13,8 @@ 
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



#include <my_global.h>

#include <m_string.h>

#include <m_ctype.h>

#include <stdlib.h>

#include <ctype.h>

#include <plugin.h>



long number_of_calls= 0; /* for SHOW STATUS, see below */
@@ -181,7 +180,7 @@ int simple_parser_parse(MYSQL_FTPARSER_PARAM *param) 
        add_word(param, start, end - start);

      break;

    }

    else if (my_isspace(param->cs, *end))

    else if (isspace(*end))

    {

      if (end > start)

        add_word(param, start, end - start);

sql/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ DEFS = -DMYSQL_SERVER \ 


BUILT_SOURCES =		sql_yacc.cc sql_yacc.h lex_hash.h

EXTRA_DIST =		udf_example.cc handlerton-win.cc $(BUILT_SOURCES)

DISTCLEANFILES =        lex_hash.h

CLEANFILES =        	lex_hash.h sql_yacc.cc sql_yacc.h

AM_YFLAGS =		-d



mysql_tzinfo_to_sql.cc:

sql/handler.h

+11 −16
Original line number Diff line number Diff line
@@ -799,14 +799,6 @@ typedef int (*get_partitions_in_range_iter)(partition_info *part_info, 
                                            PARTITION_ITERATOR *part_iter);





/* Initialize the iterator to return a single partition with given part_id */

inline void init_single_partition_iterator(uint32 part_id,

                                           PARTITION_ITERATOR *part_iter);



/* Initialize the iterator to enumerate all partitions */

inline void init_all_partitions_iterator(partition_info *part_info,

                                         PARTITION_ITERATOR *part_iter);



class partition_info : public Sql_alloc

{

public:
@@ -1006,7 +998,9 @@ class partition_info : public Sql_alloc 
#ifdef WITH_PARTITION_STORAGE_ENGINE

uint32 get_next_partition_id_range(struct st_partition_iter* part_iter);



inline void init_single_partition_iterator(uint32 part_id,

/* Initialize the iterator to return a single partition with given part_id */



static inline void init_single_partition_iterator(uint32 part_id,

                                           PARTITION_ITERATOR *part_iter)

{

  part_iter->part_nums.start= part_id;
@@ -1014,7 +1008,8 @@ inline void init_single_partition_iterator(uint32 part_id, 
  part_iter->get_next= get_next_partition_id_range;

}



inline 

/* Initialize the iterator to enumerate all partitions */

static inline

void init_all_partitions_iterator(partition_info *part_info,

                                  PARTITION_ITERATOR *part_iter)

{
@@ -1033,7 +1028,7 @@ void init_all_partitions_iterator(partition_info *part_info, 
  DESCRIPTION

    A routine to check for subpartitioning for improved readability of code

*/

inline

static inline

bool is_sub_partitioned(partition_info *part_info)

{ return (part_info->subpart_type == NOT_A_PARTITION ?  FALSE : TRUE); }
@@ -1049,7 +1044,7 @@ bool is_sub_partitioned(partition_info *part_info) 
    A routine to check for number of partitions for improved readability

    of code

*/

inline

static inline

uint get_tot_partitions(partition_info *part_info)

{

  return part_info->no_parts *
@@ -1923,22 +1918,22 @@ handlerton *ha_checktype(THD *thd, enum legacy_db_type database_type, 
                          bool no_substitute, bool report_error);





inline enum legacy_db_type ha_legacy_type(const handlerton *db_type)

static inline enum legacy_db_type ha_legacy_type(const handlerton *db_type)

{

  return (db_type == NULL) ? DB_TYPE_UNKNOWN : db_type->db_type;

}



inline const char *ha_resolve_storage_engine_name(const handlerton *db_type)

static inline const char *ha_resolve_storage_engine_name(const handlerton *db_type)

{

  return db_type == NULL ? "UNKNOWN" : db_type->name;

}



inline bool ha_check_storage_engine_flag(const handlerton *db_type, uint32 flag)

static inline bool ha_check_storage_engine_flag(const handlerton *db_type, uint32 flag)

{

  return db_type == NULL ? FALSE : test(db_type->flags & flag);

}



inline bool ha_storage_engine_is_enabled(const handlerton *db_type)

static inline bool ha_storage_engine_is_enabled(const handlerton *db_type)

{

  return (db_type && db_type->create) ?

         (db_type->state == SHOW_OPTION_YES) : FALSE;