summaryrefslogtreecommitdiff
path: root/sql/ha_innobase.cc
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-12-17 03:02:58 +0200
committerunknown <monty@hundin.mysql.fi>2001-12-17 03:02:58 +0200
commit8f05035c27d876380965b53b4f1b2ab046825c6f (patch)
tree941257314e6e021bd649a4b42156be700895e6a0 /sql/ha_innobase.cc
parent565e5cc71de483e9bdf5ff6897c861190125db3e (diff)
downloadmariadb-git-8f05035c27d876380965b53b4f1b2ab046825c6f.tar.gz
Lots of portability fixes.
Fixed shutdown on HPUX. Fixed bug in query cache. Docs/manual.texi: Changelog configure.in: Fixes for HPUX include/m_string.h: Fixes for Purify include/my_pthread.h: Fixes for HPUX include/raid.h: Portability fix. innobase/include/univ.i: Portability fix. mysql-test/mysql-test-run.sh: Added --manual-gdb mysql-test/r/rpl_log.result: Portability fix mysql-test/t/rpl_log.test: Portability fix mysys/my_pthread.c: Portability fix (HPUX) mysys/raid.cc: Portability fix mysys/thr_mutex.c: Portability fix scripts/mysql_install_db.sh: Clean up install message sql-bench/test-alter-table.sh: Fix testsuite sql/ha_innobase.cc: Fixed stack overwrite. sql/log_event.cc: Fixed purify warning sql/mysqld.cc: Added patch from FreeBSD port. Fixed shutdown on HPUX. sql/slave.cc: Cleanup sql/sql_cache.cc: Binary search in 'step' searching Check maximal block in bin Limit of comparasions number in list of memory blocks. Fixed bug in pack() sql/sql_cache.h: Binary search in 'step' searching Check maximal block in bin Limit of comparasions number in list of memory blocks. Fixed bug in pack() sql/sql_parse.cc: Optimize tools/mysqlmanager.c: Portability fix
Diffstat (limited to 'sql/ha_innobase.cc')
-rw-r--r--sql/ha_innobase.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc
index fb22b2d079c..8dd2e49e093 100644
--- a/sql/ha_innobase.cc
+++ b/sql/ha_innobase.cc
@@ -536,7 +536,7 @@ innobase_init(void)
{
int err;
bool ret;
- char current_lib[2], *default_path;
+ char current_lib[3], *default_path;
DBUG_ENTER("innobase_init");
@@ -2044,7 +2044,7 @@ ha_innobase::change_active_index(
else
prebuilt->index = dict_table_get_first_index_noninline(prebuilt->table);
- assert(prebuilt->search_tuple);
+ assert(prebuilt->search_tuple != 0);
dtuple_set_n_fields(prebuilt->search_tuple, prebuilt->index->n_fields);
@@ -2762,7 +2762,7 @@ ha_innobase::create(
innobase_table = dict_table_get(norm_name, NULL);
- assert(innobase_table);
+ assert(innobase_table != 0);
/* Tell the InnoDB server that there might be work for
utility threads: */