database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Change C_STRING_WITH_LEN to STRING_WITH_LEN

Browse Source 
This preserves const str for constant strings

Other things
- A few variables where changed from LEX_STRING to LEX_CSTRING
- Incident_log_event::Incident_log_event and record_incident where
  changed to take LEX_CSTRING* as an argument instead of LEX_STRING
This commit is contained in:
Monty
2018-01-08 15:33:23 +02:00
parent 18e22cb69f
commit f55dc7f733
38 changed files with 763 additions and 778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
sql/sql_type.cc
View File

@ -399,45 +399,45 @@ uint Type_handler_time::m_hires_bytes[MAX_DATETIME_PRECISION + 1]=
{ 3, 4, 4, 5, 5, 5, 6 };
/***************************************************************************/
const Name Type_handler_row::m_name_row(C_STRING_WITH_LEN("row"));
const Name Type_handler_row::m_name_row(STRING_WITH_LEN("row"));
const Name Type_handler_null::m_name_null(C_STRING_WITH_LEN("null"));
const Name Type_handler_null::m_name_null(STRING_WITH_LEN("null"));
const Name
Type_handler_string::m_name_char(C_STRING_WITH_LEN("char")),
Type_handler_var_string::m_name_var_string(C_STRING_WITH_LEN("varchar")),
Type_handler_varchar::m_name_varchar(C_STRING_WITH_LEN("varchar")),
Type_handler_tiny_blob::m_name_tinyblob(C_STRING_WITH_LEN("tinyblob")),
Type_handler_medium_blob::m_name_mediumblob(C_STRING_WITH_LEN("mediumblob")),
Type_handler_long_blob::m_name_longblob(C_STRING_WITH_LEN("longblob")),
Type_handler_blob::m_name_blob(C_STRING_WITH_LEN("blob"));
Type_handler_string::m_name_char(STRING_WITH_LEN("char")),
Type_handler_var_string::m_name_var_string(STRING_WITH_LEN("varchar")),
Type_handler_varchar::m_name_varchar(STRING_WITH_LEN("varchar")),
Type_handler_tiny_blob::m_name_tinyblob(STRING_WITH_LEN("tinyblob")),
Type_handler_medium_blob::m_name_mediumblob(STRING_WITH_LEN("mediumblob")),
Type_handler_long_blob::m_name_longblob(STRING_WITH_LEN("longblob")),
Type_handler_blob::m_name_blob(STRING_WITH_LEN("blob"));
const Name
Type_handler_enum::m_name_enum(C_STRING_WITH_LEN("enum")),
Type_handler_set::m_name_set(C_STRING_WITH_LEN("set"));
Type_handler_enum::m_name_enum(STRING_WITH_LEN("enum")),
Type_handler_set::m_name_set(STRING_WITH_LEN("set"));
const Name
Type_handler_tiny::m_name_tiny(C_STRING_WITH_LEN("tinyint")),
Type_handler_short::m_name_short(C_STRING_WITH_LEN("smallint")),
Type_handler_long::m_name_int(C_STRING_WITH_LEN("int")),
Type_handler_longlong::m_name_longlong(C_STRING_WITH_LEN("bigint")),
Type_handler_int24::m_name_mediumint(C_STRING_WITH_LEN("mediumint")),
Type_handler_year::m_name_year(C_STRING_WITH_LEN("year")),
Type_handler_bit::m_name_bit(C_STRING_WITH_LEN("bit"));
Type_handler_tiny::m_name_tiny(STRING_WITH_LEN("tinyint")),
Type_handler_short::m_name_short(STRING_WITH_LEN("smallint")),
Type_handler_long::m_name_int(STRING_WITH_LEN("int")),
Type_handler_longlong::m_name_longlong(STRING_WITH_LEN("bigint")),
Type_handler_int24::m_name_mediumint(STRING_WITH_LEN("mediumint")),
Type_handler_year::m_name_year(STRING_WITH_LEN("year")),
Type_handler_bit::m_name_bit(STRING_WITH_LEN("bit"));
const Name
Type_handler_float::m_name_float(C_STRING_WITH_LEN("float")),
Type_handler_double::m_name_double(C_STRING_WITH_LEN("double"));
Type_handler_float::m_name_float(STRING_WITH_LEN("float")),
Type_handler_double::m_name_double(STRING_WITH_LEN("double"));
const Name
Type_handler_olddecimal::m_name_decimal(C_STRING_WITH_LEN("decimal")),
Type_handler_newdecimal::m_name_decimal(C_STRING_WITH_LEN("decimal"));
Type_handler_olddecimal::m_name_decimal(STRING_WITH_LEN("decimal")),
Type_handler_newdecimal::m_name_decimal(STRING_WITH_LEN("decimal"));
const Name
Type_handler_time_common::m_name_time(C_STRING_WITH_LEN("time")),
Type_handler_date_common::m_name_date(C_STRING_WITH_LEN("date")),
Type_handler_datetime_common::m_name_datetime(C_STRING_WITH_LEN("datetime")),
Type_handler_timestamp_common::m_name_timestamp(C_STRING_WITH_LEN("timestamp"));
Type_handler_time_common::m_name_time(STRING_WITH_LEN("time")),
Type_handler_date_common::m_name_date(STRING_WITH_LEN("date")),
Type_handler_datetime_common::m_name_datetime(STRING_WITH_LEN("datetime")),
Type_handler_timestamp_common::m_name_timestamp(STRING_WITH_LEN("timestamp"));
/***************************************************************************/
@ -1388,7 +1388,7 @@ Field *Type_handler_long_blob::make_conversion_table_field(TABLE *table,
#ifdef HAVE_SPATIAL
const Name Type_handler_geometry::m_name_geometry(C_STRING_WITH_LEN("geometry"));
const Name Type_handler_geometry::m_name_geometry(STRING_WITH_LEN("geometry"));
const Type_handler *Type_handler_geometry::type_handler_for_comparison() const
@ -3966,7 +3966,7 @@ String *Type_handler_row::
{
CHARSET_INFO *cs= thd->variables.character_set_client;
StringBuffer<STRING_BUFFER_USUAL_SIZE> val(cs);
str->append(C_STRING_WITH_LEN("ROW("));
str->append(STRING_WITH_LEN("ROW("));
for (uint i= 0 ; i < item->cols(); i++)
{
if (i > 0)
@ -3978,7 +3978,7 @@ String *Type_handler_row::
else
str->append(STRING_WITH_LEN("NULL"));
}
str->append(C_STRING_WITH_LEN(")"));
str->append(STRING_WITH_LEN(")"));
return str;
}
@ -4042,7 +4042,7 @@ String *Type_handler_time_common::
{
StringBuffer<MAX_TIME_FULL_WIDTH+1> buf;
return print_item_value_temporal(thd, item, str,
Name(C_STRING_WITH_LEN("TIME")), &buf);
Name(STRING_WITH_LEN("TIME")), &buf);
}
@ -4051,7 +4051,7 @@ String *Type_handler_date_common::
{
StringBuffer<MAX_DATE_WIDTH+1> buf;
return print_item_value_temporal(thd, item, str,
Name(C_STRING_WITH_LEN("DATE")), &buf);
Name(STRING_WITH_LEN("DATE")), &buf);
}
@ -4060,7 +4060,7 @@ String *Type_handler_datetime_common::
{
StringBuffer<MAX_DATETIME_FULL_WIDTH+1> buf;
return print_item_value_temporal(thd, item, str,
Name(C_STRING_WITH_LEN("TIMESTAMP")), &buf);
Name(STRING_WITH_LEN("TIMESTAMP")), &buf);
}
@ -4069,7 +4069,7 @@ String *Type_handler_timestamp_common::
{
StringBuffer<MAX_DATETIME_FULL_WIDTH+1> buf;
return print_item_value_temporal(thd, item, str,
Name(C_STRING_WITH_LEN("TIMESTAMP")), &buf);
Name(STRING_WITH_LEN("TIMESTAMP")), &buf);
}