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

62
sql/sql_signal.cc
View File

@ -29,38 +29,38 @@
*/
#define MAX_MYSQL_ERRNO 65534
const LEX_STRING Diag_condition_item_names[]=
const LEX_CSTRING Diag_condition_item_names[]=
{
{ C_STRING_WITH_LEN("CLASS_ORIGIN") },
{ C_STRING_WITH_LEN("SUBCLASS_ORIGIN") },
{ C_STRING_WITH_LEN("CONSTRAINT_CATALOG") },
{ C_STRING_WITH_LEN("CONSTRAINT_SCHEMA") },
{ C_STRING_WITH_LEN("CONSTRAINT_NAME") },
{ C_STRING_WITH_LEN("CATALOG_NAME") },
{ C_STRING_WITH_LEN("SCHEMA_NAME") },
{ C_STRING_WITH_LEN("TABLE_NAME") },
{ C_STRING_WITH_LEN("COLUMN_NAME") },
{ C_STRING_WITH_LEN("CURSOR_NAME") },
{ C_STRING_WITH_LEN("MESSAGE_TEXT") },
{ C_STRING_WITH_LEN("MYSQL_ERRNO") },
{ STRING_WITH_LEN("CLASS_ORIGIN") },
{ STRING_WITH_LEN("SUBCLASS_ORIGIN") },
{ STRING_WITH_LEN("CONSTRAINT_CATALOG") },
{ STRING_WITH_LEN("CONSTRAINT_SCHEMA") },
{ STRING_WITH_LEN("CONSTRAINT_NAME") },
{ STRING_WITH_LEN("CATALOG_NAME") },
{ STRING_WITH_LEN("SCHEMA_NAME") },
{ STRING_WITH_LEN("TABLE_NAME") },
{ STRING_WITH_LEN("COLUMN_NAME") },
{ STRING_WITH_LEN("CURSOR_NAME") },
{ STRING_WITH_LEN("MESSAGE_TEXT") },
{ STRING_WITH_LEN("MYSQL_ERRNO") },
{ C_STRING_WITH_LEN("CONDITION_IDENTIFIER") },
{ C_STRING_WITH_LEN("CONDITION_NUMBER") },
{ C_STRING_WITH_LEN("CONNECTION_NAME") },
{ C_STRING_WITH_LEN("MESSAGE_LENGTH") },
{ C_STRING_WITH_LEN("MESSAGE_OCTET_LENGTH") },
{ C_STRING_WITH_LEN("PARAMETER_MODE") },
{ C_STRING_WITH_LEN("PARAMETER_NAME") },
{ C_STRING_WITH_LEN("PARAMETER_ORDINAL_POSITION") },
{ C_STRING_WITH_LEN("RETURNED_SQLSTATE") },
{ C_STRING_WITH_LEN("ROUTINE_CATALOG") },
{ C_STRING_WITH_LEN("ROUTINE_NAME") },
{ C_STRING_WITH_LEN("ROUTINE_SCHEMA") },
{ C_STRING_WITH_LEN("SERVER_NAME") },
{ C_STRING_WITH_LEN("SPECIFIC_NAME") },
{ C_STRING_WITH_LEN("TRIGGER_CATALOG") },
{ C_STRING_WITH_LEN("TRIGGER_NAME") },
{ C_STRING_WITH_LEN("TRIGGER_SCHEMA") }
{ STRING_WITH_LEN("CONDITION_IDENTIFIER") },
{ STRING_WITH_LEN("CONDITION_NUMBER") },
{ STRING_WITH_LEN("CONNECTION_NAME") },
{ STRING_WITH_LEN("MESSAGE_LENGTH") },
{ STRING_WITH_LEN("MESSAGE_OCTET_LENGTH") },
{ STRING_WITH_LEN("PARAMETER_MODE") },
{ STRING_WITH_LEN("PARAMETER_NAME") },
{ STRING_WITH_LEN("PARAMETER_ORDINAL_POSITION") },
{ STRING_WITH_LEN("RETURNED_SQLSTATE") },
{ STRING_WITH_LEN("ROUTINE_CATALOG") },
{ STRING_WITH_LEN("ROUTINE_NAME") },
{ STRING_WITH_LEN("ROUTINE_SCHEMA") },
{ STRING_WITH_LEN("SERVER_NAME") },
{ STRING_WITH_LEN("SPECIFIC_NAME") },
{ STRING_WITH_LEN("TRIGGER_CATALOG") },
{ STRING_WITH_LEN("TRIGGER_NAME") },
{ STRING_WITH_LEN("TRIGGER_SCHEMA") }
};
@ -210,7 +210,7 @@ int Sql_cmd_common_signal::eval_signal_informations(THD *thd, Sql_condition *con
int result= 1;
enum enum_diag_condition_item_name item_enum;
String *member;
const LEX_STRING *name;
const LEX_CSTRING *name;
DBUG_ENTER("Sql_cmd_common_signal::eval_signal_informations");