mirror of
https://github.com/MariaDB/server.git
synced 2026-04-30 20:25:32 +02:00
Merge
BitKeeper/etc/logging_ok: auto-union client/mysqldump.c: Auto merged innobase/include/srv0srv.h: Auto merged innobase/srv/srv0srv.c: Auto merged mysql-test/r/mysqldump.result: Auto merged sql/ha_innodb.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_cache.cc: Auto merged strings/ctype-simple.c: SCCS merged
This commit is contained in:
commit
8b08a2e87f
8 changed files with 42 additions and 25 deletions
|
|
@ -174,7 +174,7 @@ int my_strnncollsp_simple(CHARSET_INFO * cs, const uchar *a, uint a_length,
|
|||
/* put shorter key in s */
|
||||
a_length= b_length;
|
||||
a= b;
|
||||
swap= -1; /* swap sign of result */
|
||||
swap= -1^1; /* swap sign of result */
|
||||
res= -res;
|
||||
}
|
||||
for (end= a + a_length-length; a < end ; a++)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue