summaryrefslogtreecommitdiff
path: root/libmysql/libmysql.c
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-10-20 11:24:08 +0300
committermonty@mysql.com <>2004-10-20 11:24:08 +0300
commit1f8b3d0f22070d450226ef4f6e0e31c8ef8cd401 (patch)
tree5012e0497271e138067e54c110bf06958ba1f520 /libmysql/libmysql.c
parentc01c8f99ea16fb2029efade30b8bf18ae314c03a (diff)
downloadmariadb-git-1f8b3d0f22070d450226ef4f6e0e31c8ef8cd401.tar.gz
Code cleanups (done during review of new code)
Rename innodb_table_locks_old_behavior -> innodb_table_locks Set innodb_table_locks to off by default to get same behaviour as in MySQL 4.0.20 (This means that Innodb ignore table locks by default, which makes it easier to combine MyISAM and InnoDB to simulate a transaction)
Diffstat (limited to 'libmysql/libmysql.c')
-rw-r--r--libmysql/libmysql.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 9257bf0efd0..09675bc7fab 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -3170,20 +3170,18 @@ void my_net_local_init(NET *net)
encoded string, not including the terminating null character.
*/
-unsigned long
-mysql_hex_string(char *to, const char *from, unsigned long length)
+ulong mysql_hex_string(char *to, const char *from, ulong length)
{
char *to0= to;
const char *end;
- static char hex[]= "0123456789ABCDEF";
for (end= from + length; from < end; from++)
{
- *to++= hex[((unsigned char) *from) >> 4];
- *to++= hex[((unsigned char) *from) & 0x0F];
+ *to++= _dig_vec[((unsigned char) *from) >> 4];
+ *to++= _dig_vec[((unsigned char) *from) & 0x0F];
}
*to= '\0';
- return to-to0;
+ return (ulong) (to-to0);
}
/*