diff options
| author | monty@mysql.com <> | 2005-03-21 23:41:28 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-03-21 23:41:28 +0200 |
| commit | a1ab786091b3af1620af03313b0c7a467813a5d2 (patch) | |
| tree | 0dc25c2b0b090f45da0eec51acfbcb6d42180cd6 /sql/handler.cc | |
| parent | df12e29955a0421f131e2239ef042eb1add225c6 (diff) | |
| download | mariadb-git-a1ab786091b3af1620af03313b0c7a467813a5d2.tar.gz | |
Cleanups during review of code
Fixed newly introduced bug in rollup
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index df0d7704163..98fc2be2f8a 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -762,14 +762,13 @@ static char* xid_to_str(char *buf, XID *xid) for (i=0; i < xid->gtrid_length+xid->bqual_length; i++) { uchar c=(uchar)xid->data[i]; - bool is_next_dig; + /* is_next_dig is set if next character is a number */ + bool is_next_dig= FALSE; if (i < XIDDATASIZE) { - char ch=xid->data[i+1]; - is_next_dig=(c >= '0' && c <='9'); + char ch= xid->data[i+1]; + is_next_dig= (ch >= '0' && ch <='9'); } - else - is_next_dig=FALSE; if (i == xid->gtrid_length) { *s++='\''; @@ -782,6 +781,11 @@ static char* xid_to_str(char *buf, XID *xid) if (c < 32 || c > 126) { *s++='\\'; + /* + If next character is a number, write current character with + 3 octal numbers to ensure that the next number is not seen + as part of the octal number + */ if (c > 077 || is_next_dig) *s++=_dig_vec_lower[c >> 6]; if (c > 007 || is_next_dig) |