diff options
| author | monty@donna.mysql.fi <> | 2001-03-24 20:15:14 +0200 |
|---|---|---|
| committer | monty@donna.mysql.fi <> | 2001-03-24 20:15:14 +0200 |
| commit | aa115733800a27fb5ba1f9dd9a3f05b1ec8ec445 (patch) | |
| tree | e705394f8291c4c2268717e3fb70734414d0f1d9 /sql/ha_innobase.cc | |
| parent | 2531f38803ff6804d6b195cb4f52cc55365435ed (diff) | |
| download | mariadb-git-aa115733800a27fb5ba1f9dd9a3f05b1ec8ec445.tar.gz | |
Added defines for fast mutex in glibc 2.2 (should be safe)
Fixed crash in SELECT DISTINCT SUM(...)
Fix return value of mysortncmp() for innobase
Fix join_crash bug
Diffstat (limited to 'sql/ha_innobase.cc')
| -rw-r--r-- | sql/ha_innobase.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc index b36d1ca1ffc..d509e696806 100644 --- a/sql/ha_innobase.cc +++ b/sql/ha_innobase.cc @@ -917,6 +917,7 @@ innobase_mysql_cmp( not UNIV_SQL_NULL */ { enum_field_types mysql_tp; + int ret; dbug_assert(a_length != UNIV_SQL_NULL); dbug_assert(b_length != UNIV_SQL_NULL); @@ -927,8 +928,15 @@ innobase_mysql_cmp( case FIELD_TYPE_STRING: case FIELD_TYPE_VAR_STRING: - return(my_sortncmp((const char*) a, a_length, - (const char*) b, b_length)); + ret = my_sortncmp((const char*) a, a_length, + (const char*) b, b_length); + if (ret < 0) { + return(-1); + } else if (ret > 0) { + return(1); + } else { + return(0); + } default: assert(0); } |