take out begins_with_insensitive--never liked that thing, anyway, and turned out to not be the real bug
This commit is contained in:
parent
c235dcdf46
commit
f910919ffc
44
ext/mysql.c
44
ext/mysql.c
@ -1064,28 +1064,6 @@ static VALUE simulate_disconnect( VALUE obj )
|
|||||||
return Qnil;
|
return Qnil;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int begins_with_insensitive(char *candidate, char *check_for_in_upper_case)
|
|
||||||
{
|
|
||||||
/* skip opening whitespace --tab is 11, newline is 12, cr is 15, space 32 */
|
|
||||||
char *where_at = candidate;
|
|
||||||
while( ((*where_at >= 11 && *where_at <= 15) || (*where_at == 32)) && (where_at != 0))
|
|
||||||
where_at++;
|
|
||||||
|
|
||||||
char *where_at_in_test = check_for_in_upper_case;
|
|
||||||
while(*where_at_in_test)
|
|
||||||
{
|
|
||||||
int candidate_char = *where_at;
|
|
||||||
if(candidate_char == 0)
|
|
||||||
return 0; /* end of line */
|
|
||||||
if(candidate_char >= 97 && candidate_char < 122) /* then it's upper case --lower case ify it */
|
|
||||||
candidate_char -= 32;
|
|
||||||
if(candidate_char != *where_at_in_test)
|
|
||||||
return 0;
|
|
||||||
where_at_in_test++;
|
|
||||||
where_at++;
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* send_query(sql) */
|
/* send_query(sql) */
|
||||||
static VALUE send_query(VALUE obj, VALUE sql)
|
static VALUE send_query(VALUE obj, VALUE sql)
|
||||||
@ -1104,26 +1082,10 @@ static VALUE send_query(VALUE obj, VALUE sql)
|
|||||||
if (mysql_send_query(m, RSTRING_PTR(sql), RSTRING_LEN(sql)) != 0){
|
if (mysql_send_query(m, RSTRING_PTR(sql), RSTRING_LEN(sql)) != 0){
|
||||||
idle( obj );
|
idle( obj );
|
||||||
mysql_raise(m);
|
mysql_raise(m);
|
||||||
}
|
}
|
||||||
|
async_in_progress_set( obj, Qtrue );
|
||||||
|
|
||||||
/* what about http://dev.mysql.com/doc/refman/5.0/en/implicit-commit.html and more? */
|
return Qnil;
|
||||||
if(
|
|
||||||
begins_with_insensitive(RSTRING_PTR(sql), "SET ") ||
|
|
||||||
begins_with_insensitive(RSTRING_PTR(sql), "BEGIN") ||
|
|
||||||
begins_with_insensitive(RSTRING_PTR(sql), "START TRANSACTION") ||
|
|
||||||
begins_with_insensitive(RSTRING_PTR(sql), "ROLLBACK") ||
|
|
||||||
begins_with_insensitive(RSTRING_PTR(sql), "LOCK ") ||
|
|
||||||
begins_with_insensitive(RSTRING_PTR(sql), "UNLOCK ") ||
|
|
||||||
begins_with_insensitive(RSTRING_PTR(sql), "USE ") ||
|
|
||||||
begins_with_insensitive(RSTRING_PTR(sql), "COMMIT") )
|
|
||||||
{
|
|
||||||
/* do not mark an async in progress --they used send_query for something that doesn't necessarily have a result--is this allowable? */
|
|
||||||
async_in_progress_set( obj, Qfalse );
|
|
||||||
} else {
|
|
||||||
async_in_progress_set( obj, Qtrue );
|
|
||||||
}
|
|
||||||
|
|
||||||
return Qnil;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* get_result */
|
/* get_result */
|
||||||
|
Loading…
Reference in New Issue
Block a user