diff options
author | unknown <monty@donna.mysql.fi> | 2001-03-26 13:27:36 +0300 |
---|---|---|
committer | unknown <monty@donna.mysql.fi> | 2001-03-26 13:27:36 +0300 |
commit | 4bf00b00b74e11b801d6ad4ade5de9a07b88e1cf (patch) | |
tree | e9c9fdeab5d0a635045172c211af567c8b6a81b9 /sql/ha_innobase.cc | |
parent | 653f620e6f3f416ef327ec85daf1ba4f0654442c (diff) | |
download | mariadb-git-4bf00b00b74e11b801d6ad4ade5de9a07b88e1cf.tar.gz |
Added test case that crashed Innobase
BUILD/compile-solaris-sparc-purify:
Changed to old (easy-to-edit) format
extra/resolve_stack_dump.c:
Don't require -s and -n options
innobase/include/Makefile.i:
Applied Heikki's changes
innobase/include/univ.i:
Applied Heikki's changes
innobase/os/os0file.c:
Fix problem with Signal 14 on Solaris
mysys/mf_qsort.c:
Fix for purify
sql-bench/Results/ATIS-mysql-Linux_2.2.16_SMP_alpha:
New test results
sql-bench/Results/RUN-mysql-Linux_2.2.16_SMP_alpha:
New test results
sql-bench/Results/alter-table-mysql-Linux_2.2.16_SMP_alpha:
New test results
sql-bench/Results/big-tables-mysql-Linux_2.2.16_SMP_alpha:
New test results
sql-bench/Results/connect-mysql-Linux_2.2.16_SMP_alpha:
New test results
sql-bench/Results/create-mysql-Linux_2.2.16_SMP_alpha:
New test results
sql-bench/Results/insert-mysql-Linux_2.2.16_SMP_alpha:
New test results
sql-bench/Results/select-mysql-Linux_2.2.16_SMP_alpha:
New test results
sql-bench/Results/wisconsin-mysql-Linux_2.2.16_SMP_alpha:
New test results
sql/ha_gemini.h:
Fixed that SHOW VARIABLES shows table type as disabled if it can't be initialized.
sql/ha_innobase.cc:
Merged Heikkis changes
sql/ha_innobase.h:
Fixed that SHOW VARIABLES shows table type as disabled if it can't be initialized.
sql/handler.cc:
Fixed that SHOW VARIABLES shows table type as disabled if it can't be initialized.
sql/mysqld.cc:
Cleaned up error warning message.
Diffstat (limited to 'sql/ha_innobase.cc')
-rw-r--r-- | sql/ha_innobase.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc index bf9f2a38740..45dcb4e80df 100644 --- a/sql/ha_innobase.cc +++ b/sql/ha_innobase.cc @@ -917,7 +917,7 @@ innobase_mysql_cmp( not UNIV_SQL_NULL */ { enum_field_types mysql_tp; - int ret; + int ret; dbug_assert(a_length != UNIV_SQL_NULL); dbug_assert(b_length != UNIV_SQL_NULL); @@ -928,9 +928,15 @@ innobase_mysql_cmp( case FIELD_TYPE_STRING: case FIELD_TYPE_VAR_STRING: - ret = my_sortncmp((const char*) a, a_length, - (const char*) b, b_length); - return ret; + 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); } |