summaryrefslogtreecommitdiff
path: root/sql/sql_bitmap.h
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-05-26 19:12:49 +0300
committerunknown <monty@mysql.com>2004-05-26 19:12:49 +0300
commit30bffb0213dbc5b52823b167de71dd96aff1bf16 (patch)
tree45397c78051c557e55bc9b5df93c68604da6a451 /sql/sql_bitmap.h
parent1d482780b0da780a02067735cff8cd8f555236e9 (diff)
downloadmariadb-git-30bffb0213dbc5b52823b167de71dd96aff1bf16.tar.gz
Changed prototype of killed_ptr() to make it more portable
Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
Diffstat (limited to 'sql/sql_bitmap.h')
-rw-r--r--sql/sql_bitmap.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/sql_bitmap.h b/sql/sql_bitmap.h
index 0274cd700da..96570c508e6 100644
--- a/sql/sql_bitmap.h
+++ b/sql/sql_bitmap.h
@@ -91,7 +91,16 @@ template <> class Bitmap<64>
ulonglong map;
public:
Bitmap<64>() { }
+#if defined(__NETWARE__)
+ /*
+ Metwork compiler gives error on Bitmap<64>
+ Changed to Bitmap, since in this case also it will proper construct
+ this class
+ */
+ explicit Bitmap(uint prefix_to_set) { set_prefix(prefix_to_set); }
+#else
explicit Bitmap<64>(uint prefix_to_set) { set_prefix(prefix_to_set); }
+#endif
void init() { }
void init(uint prefix_to_set) { set_prefix(prefix_to_set); }
uint length() const { return 64; }