mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt include/m_string.h: Auto merged include/my_sys.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/log.cc: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/share/errmsg.txt: C Merged. ?
This commit is contained in:
@@ -240,4 +240,22 @@ extern int my_snprintf(char* to, size_t n, const char* fmt, ...);
|
||||
#if defined(__cplusplus)
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
LEX_STRING -- a pair of a C-string and its length.
|
||||
|
||||
NOTE: this exactly form of declaration is required for some C-compilers
|
||||
(for one, Sun C 5.7 2005/01/07). Unfortunatelt with such declaration
|
||||
LEX_STRING can not be forward declared.
|
||||
*/
|
||||
|
||||
typedef struct
|
||||
{
|
||||
char *str;
|
||||
uint length;
|
||||
} LEX_STRING;
|
||||
|
||||
#define STRING_WITH_LEN(X) (X), ((uint) (sizeof(X) - 1))
|
||||
#define C_STRING_WITH_SIZE(X) ((char *) (X)), ((uint) (sizeof(X) - 1))
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user