mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
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) libmysql/libmysql.c: Use ulong instead of unsigned long Reuse _dig_vec() myisam/myisampack.c: Simplify code mysql-test/r/innodb-lock.result: new test case mysql-test/t/innodb-lock.test: new test case sql/ha_innodb.cc: Rename innodb_table_locks_old_behavior -> innodb_table_locks sql/mysqld.cc: Rename innodb_table_locks_old_behavior -> innodb_table_locks Set this off by default to get same behaviour as in MySQL 4.0.20 sql/set_var.cc: Rename innodb_table_locks_old_behavior -> innodb_table_locks sql/sql_class.h: Rename innodb_table_locks_old_behavior -> innodb_table_locks
This commit is contained in:
@ -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);
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user