mirror of
https://github.com/MariaDB/server.git
synced 2025-11-22 13:39:41 +01:00
b6ff139aa3
Changes: - To detect automatic strlen() I removed the methods in String that uses 'const char *' without a length: - String::append(const char*) - Binary_string(const char *str) - String(const char *str, CHARSET_INFO *cs) - append_for_single_quote(const char *) All usage of append(const char*) is changed to either use String::append(char), String::append(const char*, size_t length) or String::append(LEX_CSTRING) - Added STRING_WITH_LEN() around constant string arguments to String::append() - Added overflow argument to escape_string_for_mysql() and escape_quotes_for_mysql() instead of returning (size_t) -1 on overflow. This was needed as most usage of the above functions never tested the result for -1 and would have given wrong results or crashes in case of overflows. - Added Item_func_or_sum::func_name_cstring(), which returns LEX_CSTRING. Changed all Item_func::func_name()'s to func_name_cstring()'s. The old Item_func_or_sum::func_name() is now an inline function that returns func_name_cstring().str. - Changed Item::mode_name() and Item::func_name_ext() to return LEX_CSTRING. - Changed for some functions the name argument from const char * to to const LEX_CSTRING &: - Item::Item_func_fix_attributes() - Item::check_type_...() - Type_std_attributes::agg_item_collations() - Type_std_attributes::agg_item_set_converter() - Type_std_attributes::agg_arg_charsets...() - Type_handler_hybrid_field_type::aggregate_for_result() - Type_handler_geometry::check_type_geom_or_binary() - Type_handler::Item_func_or_sum_illegal_param() - Predicant_to_list_comparator::add_value_skip_null() - Predicant_to_list_comparator::add_value() - cmp_item_row::prepare_comparators() - cmp_item_row::aggregate_row_elements_for_comparison() - Cursor_ref::print_func() - Removes String_space() as it was only used in one cases and that could be simplified to not use String_space(), thanks to the fixed my_vsnprintf(). - Added some const LEX_CSTRING's for common strings: - NULL_clex_str, DATA_clex_str, INDEX_clex_str. - Changed primary_key_name to a LEX_CSTRING - Renamed String::set_quick() to String::set_buffer_if_not_allocated() to clarify what the function really does. - Rename of protocol function: bool store(const char *from, CHARSET_INFO *cs) to bool store_string_or_null(const char *from, CHARSET_INFO *cs). This was done to both clarify the difference between this 'store' function and also to make it easier to find unoptimal usage of store() calls. - Added Protocol::store(const LEX_CSTRING*, CHARSET_INFO*) - Changed some 'const char*' arrays to instead be of type LEX_CSTRING. - class Item_func_units now used LEX_CSTRING for name. Other things: - Fixed a bug in mysql.cc:construct_prompt() where a wrong escape character in the prompt would cause some part of the prompt to be duplicated. - Fixed a lot of instances where the length of the argument to append is known or easily obtain but was not used. - Removed some not needed 'virtual' definition for functions that was inherited from the parent. I added override to these. - Fixed Ordered_key::print() to preallocate needed buffer. Old code could case memory overruns. - Simplified some loops when adding char * to a String with delimiters.
81 lines
1.8 KiB
C++
81 lines
1.8 KiB
C++
|
|
// vim:sw=2:ai
|
|
|
|
/*
|
|
* Copyright (C) 2010-2011 DeNA Co.,Ltd.. All rights reserved.
|
|
* Copyright (C) 2011 Kentoku SHIBA
|
|
* See COPYRIGHT.txt for details.
|
|
*/
|
|
|
|
#ifndef DENA_CONFIG_HPP
|
|
#define DENA_CONFIG_HPP
|
|
|
|
#include "mysql_version.h"
|
|
#if MYSQL_VERSION_ID < 50500
|
|
#include "mysql_priv.h"
|
|
#include <mysql/plugin.h>
|
|
#else
|
|
#include "sql_priv.h"
|
|
#include "probes_mysql.h"
|
|
#include "sql_class.h"
|
|
#endif
|
|
|
|
#define DENA_VERBOSE(lv, x) if (dena::verbose_level >= (lv)) { (x); }
|
|
|
|
#ifdef HANDLER_HAS_DIRECT_UPDATE_ROWS
|
|
#define INFO_KIND_HS_RET_FIELDS 1
|
|
#define INFO_KIND_HS_APPEND_STRING_REF 3
|
|
#define INFO_KIND_HS_CLEAR_STRING_REF 4
|
|
#define INFO_KIND_HS_INCREMENT_BEGIN 5
|
|
#define INFO_KIND_HS_INCREMENT_END 6
|
|
#define INFO_KIND_HS_DECREMENT_BEGIN 7
|
|
#define INFO_KIND_HS_DECREMENT_END 8
|
|
#endif
|
|
|
|
namespace dena {
|
|
|
|
#ifdef HANDLER_HAS_DIRECT_UPDATE_ROWS
|
|
struct uint32_info {
|
|
size_t info_size;
|
|
uint32 *info;
|
|
};
|
|
#endif
|
|
|
|
struct conf_param {
|
|
String key;
|
|
String val;
|
|
};
|
|
|
|
uchar *conf_get_key(
|
|
conf_param *share,
|
|
size_t *length,
|
|
my_bool not_used __attribute__ ((unused))
|
|
);
|
|
|
|
struct config {
|
|
bool init;
|
|
HASH conf_hash;
|
|
config();
|
|
~config();
|
|
conf_param *find(const String& key) const;
|
|
conf_param *find(const char *key) const;
|
|
String get_str(const String& key, const String& def =
|
|
String("", 0, &my_charset_bin)) const;
|
|
String get_str(const char *key, const char *def = "") const;
|
|
long long get_int(const String& key, long long def = 0) const;
|
|
long long get_int(const char *key, long long def = 0) const;
|
|
bool replace(const char *key, const char *val);
|
|
bool replace(const char *key, long long val);
|
|
bool compare(const char *key, const char *val);
|
|
void list_all_params() const;
|
|
config& operator =(const config& x);
|
|
};
|
|
|
|
void parse_args(int argc, char **argv, config& conf);
|
|
|
|
extern unsigned int verbose_level;
|
|
|
|
};
|
|
|
|
#endif
|
|
|