Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
into mysql.com:/home/jwinstead2/mysql-5.0-clean
This commit is contained in:
commit
fd7d355fbd
@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
target = libmysqlclient_r.la
|
target = libmysqlclient_r.la
|
||||||
target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
|
target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
|
||||||
LIBS = @LIBS@ @openssl_libs@
|
LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
|
||||||
|
|
||||||
INCLUDES = @MT_INCLUDES@ \
|
INCLUDES = @MT_INCLUDES@ \
|
||||||
-I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@ \
|
-I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@ \
|
||||||
|
@ -96,3 +96,9 @@ select * from t2;
|
|||||||
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
|
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
|
||||||
test.t1.a 1 2 1 1 0 0 1.5000 0.5000 ENUM('1','2') NOT NULL
|
test.t1.a 1 2 1 1 0 0 1.5000 0.5000 ENUM('1','2') NOT NULL
|
||||||
drop table t1,t2;
|
drop table t1,t2;
|
||||||
|
create table t1 (v varchar(128));
|
||||||
|
insert into t1 values ('abc'),('abc\'def\\hij\"klm\0opq'),('\''),('\"'),('\\'),('a\0'),('b\''),('c\"'),('d\\'),('\'b'),('\"c'),('\\d'),('a\0\0\0b'),('a\'\'\'\'b'),('a\"\"\"\"b'),('a\\\\\\\\b'),('\'\0\\\"'),('\'\''),('\"\"'),('\\\\'),('The\ZEnd');
|
||||||
|
select * from t1 procedure analyse();
|
||||||
|
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
|
||||||
|
test.t1.v " \\ 1 19 0 0 3.7619 NULL ENUM('"','""','"c','\'\0\\"','\'','\'\'','\'b','a\0\0\0b','a\0','a""""b','a\'\'\'\'b','abc','abc\'def\\hij"klm\0opq','a\\\\\\\\b','b\'','c"','d\\','The\ZEnd','\\','\\d','\\\\') NOT NULL
|
||||||
|
drop table t1;
|
||||||
|
@ -38,3 +38,7 @@ select * from t2;
|
|||||||
insert into t2 select * from t1 procedure analyse();
|
insert into t2 select * from t1 procedure analyse();
|
||||||
select * from t2;
|
select * from t2;
|
||||||
drop table t1,t2;
|
drop table t1,t2;
|
||||||
|
create table t1 (v varchar(128));
|
||||||
|
insert into t1 values ('abc'),('abc\'def\\hij\"klm\0opq'),('\''),('\"'),('\\'),('a\0'),('b\''),('c\"'),('d\\'),('\'b'),('\"c'),('\\d'),('a\0\0\0b'),('a\'\'\'\'b'),('a\"\"\"\"b'),('a\\\\\\\\b'),('\'\0\\\"'),('\'\''),('\"\"'),('\\\\'),('The\ZEnd');
|
||||||
|
select * from t1 procedure analyse();
|
||||||
|
drop table t1;
|
||||||
|
@ -121,6 +121,7 @@ SUFFIXES = .sh
|
|||||||
-e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
|
-e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
|
||||||
-e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
|
-e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
|
||||||
-e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \
|
-e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \
|
||||||
|
-e 's!@''ZLIB_LIBS''@!@ZLIB_LIBS@!' \
|
||||||
-e 's!@''LIBS''@!@LIBS@!' \
|
-e 's!@''LIBS''@!@LIBS@!' \
|
||||||
-e 's!@''WRAPLIBS''@!@WRAPLIBS@!' \
|
-e 's!@''WRAPLIBS''@!@WRAPLIBS@!' \
|
||||||
-e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \
|
-e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \
|
||||||
|
@ -59,6 +59,7 @@ int compare_ulonglong2(void* cmp_arg __attribute__((unused)),
|
|||||||
return compare_ulonglong(s,t);
|
return compare_ulonglong(s,t);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool append_escaped(String *to_str, String *from_str);
|
||||||
|
|
||||||
Procedure *
|
Procedure *
|
||||||
proc_analyse_init(THD *thd, ORDER *param, select_result *result,
|
proc_analyse_init(THD *thd, ORDER *param, select_result *result,
|
||||||
@ -890,7 +891,8 @@ int collect_string(String *element,
|
|||||||
else
|
else
|
||||||
info->found = 1;
|
info->found = 1;
|
||||||
info->str->append('\'');
|
info->str->append('\'');
|
||||||
info->str->append(*element);
|
if (append_escaped(info->str, element))
|
||||||
|
return 1;
|
||||||
info->str->append('\'');
|
info->str->append('\'');
|
||||||
return 0;
|
return 0;
|
||||||
} // collect_string
|
} // collect_string
|
||||||
@ -1025,3 +1027,58 @@ uint check_ulonglong(const char *str, uint length)
|
|||||||
while (*cmp && *cmp++ == *str++) ;
|
while (*cmp && *cmp++ == *str++) ;
|
||||||
return ((uchar) str[-1] <= (uchar) cmp[-1]) ? smaller : bigger;
|
return ((uchar) str[-1] <= (uchar) cmp[-1]) ? smaller : bigger;
|
||||||
} /* check_ulonlong */
|
} /* check_ulonlong */
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
FUNCTION: append_escaped()
|
||||||
|
|
||||||
|
DESCRIPTION
|
||||||
|
append_escaped() takes a String type variable, where it appends
|
||||||
|
escaped the second argument. Only characters that require escaping
|
||||||
|
will be escaped.
|
||||||
|
|
||||||
|
ARGUMENTS
|
||||||
|
A pointer to a String variable, where results will be appended
|
||||||
|
A pointer to a String variable, which is appended to the result
|
||||||
|
String, escaping those characters that require it.
|
||||||
|
|
||||||
|
RETURN VALUES
|
||||||
|
0 Success
|
||||||
|
1 Out of memory
|
||||||
|
*/
|
||||||
|
|
||||||
|
static bool append_escaped(String *to_str, String *from_str)
|
||||||
|
{
|
||||||
|
char *from, *end, c;
|
||||||
|
|
||||||
|
if (to_str->realloc(to_str->length() + from_str->length()))
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
from= (char*) from_str->ptr();
|
||||||
|
end= from + from_str->length();
|
||||||
|
for (; from < end; from++)
|
||||||
|
{
|
||||||
|
c= *from;
|
||||||
|
switch (c) {
|
||||||
|
case '\0':
|
||||||
|
c= '0';
|
||||||
|
break;
|
||||||
|
case '\032':
|
||||||
|
c= 'Z';
|
||||||
|
break;
|
||||||
|
case '\\':
|
||||||
|
case '\'':
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
goto normal_character;
|
||||||
|
}
|
||||||
|
if (to_str->append('\\'))
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
normal_character:
|
||||||
|
if (to_str->append(c))
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user