summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-08-28 22:18:02 +0300
committerunknown <monty@narttu.mysql.fi>2003-08-28 22:18:02 +0300
commit6fd5403d3105eb5df3e23a2dcf7ddd33a3589778 (patch)
treef39244679eaca00bb7f900f129b56e7b4c08528e /client
parent6866b92331fa7badc3d5ee34d2663bb4cc369917 (diff)
downloadmariadb-git-6fd5403d3105eb5df3e23a2dcf7ddd33a3589778.tar.gz
Portability fixes
client/mysqltest.c: Removed not used functions myisam/mi_dynrec.c: Added assert to avoid compilation errors mysql-test/r/isam.result: Updated results after merge sql/log_event.cc: Cleanup sql/mysql_priv.h: Cleanup sql/sql_class.cc: Moved Table_ident functions to .cc file to allow them to use table_case_convert() sql/sql_class.h: Moved Table_ident functions to .cc file to allow them to use table_case_convert()
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.c59
1 files changed, 0 insertions, 59 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 14a037a8e58..d733ab58243 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -491,15 +491,6 @@ void init_parser()
memset(&var_reg,0, sizeof(var_reg));
}
-int hex_val(int c)
-{
- if (isdigit(c))
- return c - '0';
- else if ((c = tolower(c)) >= 'a' && c <= 'f')
- return c - 'a' + 10;
- else
- return -1;
-}
int dyn_string_cmp(DYNAMIC_STRING* ds, const char* fname)
{
@@ -1550,56 +1541,6 @@ int do_while(struct st_query* q)
}
-int safe_copy_unescape(char* dest, char* src, int size)
-{
- register char* p_dest = dest, *p_src = src;
- register int c, val;
- enum { ST_NORMAL, ST_ESCAPED, ST_HEX2} state = ST_NORMAL ;
-
- size--; /* just to make life easier */
-
- for (; p_dest - size < dest && p_src - size < src &&
- (c = *p_src) != '\n' && c; ++p_src)
- {
- switch(state) {
- case ST_NORMAL:
- if (c == '\\')
- state = ST_ESCAPED;
- else
- *p_dest++ = c;
- break;
- case ST_ESCAPED:
- if ((val = hex_val(c)) > 0)
- {
- *p_dest = val;
- state = ST_HEX2;
- }
- else
- {
- state = ST_NORMAL;
- *p_dest++ = c;
- }
- break;
- case ST_HEX2:
- if ((val = hex_val(c)) > 0)
- {
- *p_dest = (*p_dest << 4) + val;
- p_dest++;
- }
- else
- *p_dest++ = c;
-
- state = ST_NORMAL;
- break;
-
- }
- }
-
- *p_dest = 0;
- return (p_dest - dest);
-}
-
-
int read_line(char* buf, int size)
{
int c;