You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

805 lines
21 KiB

22 years ago
22 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
22 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
22 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
22 years ago
22 years ago
22 years ago
22 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
22 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
Change client_flag to unsigned long (16 -> 32 bits) to handle more options. Don't use new password format if mysql.user has old format tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty Portability fixes for Windows client/mysql.cc: Removed compiler warnings. Make quote handling simpler include/config-win.h: Fix for myisam/rt_mbr.c include/mysql.h: Change client_flag to unsigned long to handle more options. libmysql/libmysql.c: Change client_flag to unsigned long to handle more options. libmysqld/libmysqld.c: Change client_flag to unsigned long to handle more options. myisam/rt_mbr.c: Portability fix for Windows mysql-test/r/rpl_loaddata.result: Fix test case sql/item_strfunc.cc: Don't use new password format if mysql.user has old format sql/item_strfunc.h: Don't use new password format if mysql.user has old format sql/mysql_priv.h: Don't use new password format if mysql.user has old format sql/mysqld.cc: Don't use new password format if mysql.user has old format sql/sql_acl.cc: Don't use new password format if mysql.user has old format. tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty sql/sql_class.h: Don't use new password format if mysql.user has old format sql/sql_parse.cc: Change client_flag to unsigned long to handle more options. sql/sql_yacc.yy: Don't use new password format if mysql.user has old format strings/ctype-utf8.c: Remove compiler warnings strings/ctype-win1250ch.c: Remove compiler warnings tests/grant.res: Update results
23 years ago
22 years ago
22 years ago
22 years ago
22 years ago
23 years ago
22 years ago
22 years ago
23 years ago
22 years ago
22 years ago
22 years ago
  1. /* Copyright (C) 2000 MySQL AB & Ramil Kalimullin & MySQL Finland AB
  2. & TCX DataKonsult AB
  3. This program is free software; you can redistribute it and/or modify
  4. it under the terms of the GNU General Public License as published by
  5. the Free Software Foundation; either version 2 of the License, or
  6. (at your option) any later version.
  7. This program is distributed in the hope that it will be useful,
  8. but WITHOUT ANY WARRANTY; without even the implied warranty of
  9. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  10. GNU General Public License for more details.
  11. You should have received a copy of the GNU General Public License
  12. along with this program; if not, write to the Free Software
  13. Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
  14. #include "myisamdef.h"
  15. #ifdef HAVE_RTREE_KEYS
  16. #include "rt_index.h"
  17. #include "rt_mbr.h"
  18. #define INTERSECT_CMP(amin, amax, bmin, bmax) ((amin > bmax) || (bmin > amax))
  19. #define CONTAIN_CMP(amin, amax, bmin, bmax) ((bmin > amin) || (bmax < amax))
  20. #define WITHIN_CMP(amin, amax, bmin, bmax) ((amin > bmin) || (amax < bmax))
  21. #define DISJOINT_CMP(amin, amax, bmin, bmax) ((amin <= bmax) && (bmin <= amax))
  22. #define EQUAL_CMP(amin, amax, bmin, bmax) ((amin != bmin) || (amax != bmax))
  23. #define FCMP(A, B) ((int)(A) - (int)(B))
  24. #define p_inc(A, B, X) {A += X; B += X;}
  25. #define RT_CMP(nextflag) \
  26. if (nextflag & MBR_INTERSECT) \
  27. { \
  28. if (INTERSECT_CMP(amin, amax, bmin, bmax)) \
  29. return 1; \
  30. } \
  31. else if (nextflag & MBR_CONTAIN) \
  32. { \
  33. if (CONTAIN_CMP(amin, amax, bmin, bmax)) \
  34. return 1; \
  35. } \
  36. else if (nextflag & MBR_WITHIN) \
  37. { \
  38. if (WITHIN_CMP(amin, amax, bmin, bmax)) \
  39. return 1; \
  40. } \
  41. else if (nextflag & MBR_EQUAL) \
  42. { \
  43. if (EQUAL_CMP(amin, amax, bmin, bmax)) \
  44. return 1; \
  45. } \
  46. else if (nextflag & MBR_DISJOINT) \
  47. { \
  48. if (DISJOINT_CMP(amin, amax, bmin, bmax)) \
  49. return 1; \
  50. }\
  51. else /* if unknown comparison operator */ \
  52. { \
  53. DBUG_ASSERT(0); \
  54. }
  55. #define RT_CMP_KORR(type, korr_func, len, nextflag) \
  56. { \
  57. type amin, amax, bmin, bmax; \
  58. amin = korr_func(a); \
  59. bmin = korr_func(b); \
  60. amax = korr_func(a+len); \
  61. bmax = korr_func(b+len); \
  62. RT_CMP(nextflag); \
  63. }
  64. #define RT_CMP_GET(type, get_func, len, nextflag) \
  65. { \
  66. type amin, amax, bmin, bmax; \
  67. get_func(amin, a); \
  68. get_func(bmin, b); \
  69. get_func(amax, a+len); \
  70. get_func(bmax, b+len); \
  71. RT_CMP(nextflag); \
  72. }
  73. /*
  74. Compares two keys a and b depending on nextflag
  75. nextflag can contain these flags:
  76. MBR_INTERSECT(a,b) a overlaps b
  77. MBR_CONTAIN(a,b) a contains b
  78. MBR_DISJOINT(a,b) a disjoint b
  79. MBR_WITHIN(a,b) a within b
  80. MBR_EQUAL(a,b) All coordinates of MBRs are equal
  81. MBR_DATA(a,b) Data reference is the same
  82. Returns 0 on success.
  83. */
  84. int rtree_key_cmp(HA_KEYSEG *keyseg, uchar *b, uchar *a, uint key_length,
  85. uint nextflag)
  86. {
  87. for (; (int) key_length > 0; keyseg += 2 )
  88. {
  89. uint32 keyseg_length;
  90. switch ((enum ha_base_keytype) keyseg->type) {
  91. case HA_KEYTYPE_INT8:
  92. RT_CMP_KORR(int8, mi_sint1korr, 1, nextflag);
  93. break;
  94. case HA_KEYTYPE_BINARY:
  95. RT_CMP_KORR(uint8, mi_uint1korr, 1, nextflag);
  96. break;
  97. case HA_KEYTYPE_SHORT_INT:
  98. RT_CMP_KORR(int16, mi_sint2korr, 2, nextflag);
  99. break;
  100. case HA_KEYTYPE_USHORT_INT:
  101. RT_CMP_KORR(uint16, mi_uint2korr, 2, nextflag);
  102. break;
  103. case HA_KEYTYPE_INT24:
  104. RT_CMP_KORR(int32, mi_sint3korr, 3, nextflag);
  105. break;
  106. case HA_KEYTYPE_UINT24:
  107. RT_CMP_KORR(uint32, mi_uint3korr, 3, nextflag);
  108. break;
  109. case HA_KEYTYPE_LONG_INT:
  110. RT_CMP_KORR(int32, mi_sint4korr, 4, nextflag);
  111. break;
  112. case HA_KEYTYPE_ULONG_INT:
  113. RT_CMP_KORR(uint32, mi_uint4korr, 4, nextflag);
  114. break;
  115. #ifdef HAVE_LONG_LONG
  116. case HA_KEYTYPE_LONGLONG:
  117. RT_CMP_KORR(longlong, mi_sint8korr, 8, nextflag)
  118. break;
  119. case HA_KEYTYPE_ULONGLONG:
  120. RT_CMP_KORR(ulonglong, mi_uint8korr, 8, nextflag)
  121. break;
  122. #endif
  123. case HA_KEYTYPE_FLOAT:
  124. /* The following should be safe, even if we compare doubles */
  125. RT_CMP_GET(float, mi_float4get, 4, nextflag);
  126. break;
  127. case HA_KEYTYPE_DOUBLE:
  128. RT_CMP_GET(double, mi_float8get, 8, nextflag);
  129. break;
  130. case HA_KEYTYPE_END:
  131. goto end;
  132. default:
  133. return 1;
  134. }
  135. keyseg_length= keyseg->length * 2;
  136. key_length-= keyseg_length;
  137. a+= keyseg_length;
  138. b+= keyseg_length;
  139. }
  140. end:
  141. if (nextflag & MBR_DATA)
  142. {
  143. uchar *end = a + keyseg->length;
  144. do
  145. {
  146. if (*a++ != *b++)
  147. return FCMP(a[-1], b[-1]);
  148. } while (a != end);
  149. }
  150. return 0;
  151. }
  152. #define RT_VOL_KORR(type, korr_func, len, cast) \
  153. { \
  154. type amin, amax; \
  155. amin = korr_func(a); \
  156. amax = korr_func(a+len); \
  157. res *= (cast(amax) - cast(amin)); \
  158. }
  159. #define RT_VOL_GET(type, get_func, len, cast) \
  160. { \
  161. type amin, amax; \
  162. get_func(amin, a); \
  163. get_func(amax, a+len); \
  164. res *= (cast(amax) - cast(amin)); \
  165. }
  166. /*
  167. Calculates rectangle volume
  168. */
  169. double rtree_rect_volume(HA_KEYSEG *keyseg, uchar *a, uint key_length)
  170. {
  171. double res = 1;
  172. for (; (int)key_length > 0; keyseg += 2)
  173. {
  174. uint32 keyseg_length;
  175. switch ((enum ha_base_keytype) keyseg->type) {
  176. case HA_KEYTYPE_INT8:
  177. RT_VOL_KORR(int8, mi_sint1korr, 1, (double));
  178. break;
  179. case HA_KEYTYPE_BINARY:
  180. RT_VOL_KORR(uint8, mi_uint1korr, 1, (double));
  181. break;
  182. case HA_KEYTYPE_SHORT_INT:
  183. RT_VOL_KORR(int16, mi_sint2korr, 2, (double));
  184. break;
  185. case HA_KEYTYPE_USHORT_INT:
  186. RT_VOL_KORR(uint16, mi_uint2korr, 2, (double));
  187. break;
  188. case HA_KEYTYPE_INT24:
  189. RT_VOL_KORR(int32, mi_sint3korr, 3, (double));
  190. break;
  191. case HA_KEYTYPE_UINT24:
  192. RT_VOL_KORR(uint32, mi_uint3korr, 3, (double));
  193. break;
  194. case HA_KEYTYPE_LONG_INT:
  195. RT_VOL_KORR(int32, mi_sint4korr, 4, (double));
  196. break;
  197. case HA_KEYTYPE_ULONG_INT:
  198. RT_VOL_KORR(uint32, mi_uint4korr, 4, (double));
  199. break;
  200. #ifdef HAVE_LONG_LONG
  201. case HA_KEYTYPE_LONGLONG:
  202. RT_VOL_KORR(longlong, mi_sint8korr, 8, (double));
  203. break;
  204. case HA_KEYTYPE_ULONGLONG:
  205. RT_VOL_KORR(longlong, mi_sint8korr, 8, ulonglong2double);
  206. break;
  207. #endif
  208. case HA_KEYTYPE_FLOAT:
  209. RT_VOL_GET(float, mi_float4get, 4, (double));
  210. break;
  211. case HA_KEYTYPE_DOUBLE:
  212. RT_VOL_GET(double, mi_float8get, 8, (double));
  213. break;
  214. case HA_KEYTYPE_END:
  215. key_length = 0;
  216. break;
  217. default:
  218. return -1;
  219. }
  220. keyseg_length= keyseg->length * 2;
  221. key_length-= keyseg_length;
  222. a+= keyseg_length;
  223. }
  224. return res;
  225. }
  226. #define RT_D_MBR_KORR(type, korr_func, len, cast) \
  227. { \
  228. type amin, amax; \
  229. amin = korr_func(a); \
  230. amax = korr_func(a+len); \
  231. *res++ = cast(amin); \
  232. *res++ = cast(amax); \
  233. }
  234. #define RT_D_MBR_GET(type, get_func, len, cast) \
  235. { \
  236. type amin, amax; \
  237. get_func(amin, a); \
  238. get_func(amax, a+len); \
  239. *res++ = cast(amin); \
  240. *res++ = cast(amax); \
  241. }
  242. /*
  243. Creates an MBR as an array of doubles.
  244. */
  245. int rtree_d_mbr(HA_KEYSEG *keyseg, uchar *a, uint key_length, double *res)
  246. {
  247. for (; (int)key_length > 0; keyseg += 2)
  248. {
  249. uint32 keyseg_length;
  250. switch ((enum ha_base_keytype) keyseg->type) {
  251. case HA_KEYTYPE_INT8:
  252. RT_D_MBR_KORR(int8, mi_sint1korr, 1, (double));
  253. break;
  254. case HA_KEYTYPE_BINARY:
  255. RT_D_MBR_KORR(uint8, mi_uint1korr, 1, (double));
  256. break;
  257. case HA_KEYTYPE_SHORT_INT:
  258. RT_D_MBR_KORR(int16, mi_sint2korr, 2, (double));
  259. break;
  260. case HA_KEYTYPE_USHORT_INT:
  261. RT_D_MBR_KORR(uint16, mi_uint2korr, 2, (double));
  262. break;
  263. case HA_KEYTYPE_INT24:
  264. RT_D_MBR_KORR(int32, mi_sint3korr, 3, (double));
  265. break;
  266. case HA_KEYTYPE_UINT24:
  267. RT_D_MBR_KORR(uint32, mi_uint3korr, 3, (double));
  268. break;
  269. case HA_KEYTYPE_LONG_INT:
  270. RT_D_MBR_KORR(int32, mi_sint4korr, 4, (double));
  271. break;
  272. case HA_KEYTYPE_ULONG_INT:
  273. RT_D_MBR_KORR(uint32, mi_uint4korr, 4, (double));
  274. break;
  275. #ifdef HAVE_LONG_LONG
  276. case HA_KEYTYPE_LONGLONG:
  277. RT_D_MBR_KORR(longlong, mi_sint8korr, 8, (double));
  278. break;
  279. case HA_KEYTYPE_ULONGLONG:
  280. RT_D_MBR_KORR(longlong, mi_sint8korr, 8, ulonglong2double);
  281. break;
  282. #endif
  283. case HA_KEYTYPE_FLOAT:
  284. RT_D_MBR_GET(float, mi_float4get, 4, (double));
  285. break;
  286. case HA_KEYTYPE_DOUBLE:
  287. RT_D_MBR_GET(double, mi_float8get, 8, (double));
  288. break;
  289. case HA_KEYTYPE_END:
  290. key_length = 0;
  291. break;
  292. default:
  293. return 1;
  294. }
  295. keyseg_length= keyseg->length * 2;
  296. key_length-= keyseg_length;
  297. a+= keyseg_length;
  298. }
  299. return 0;
  300. }
  301. #define RT_COMB_KORR(type, korr_func, store_func, len) \
  302. { \
  303. type amin, amax, bmin, bmax; \
  304. amin = korr_func(a); \
  305. bmin = korr_func(b); \
  306. amax = korr_func(a+len); \
  307. bmax = korr_func(b+len); \
  308. amin = min(amin, bmin); \
  309. amax = max(amax, bmax); \
  310. store_func(c, amin); \
  311. store_func(c+len, amax); \
  312. }
  313. #define RT_COMB_GET(type, get_func, store_func, len) \
  314. { \
  315. type amin, amax, bmin, bmax; \
  316. get_func(amin, a); \
  317. get_func(bmin, b); \
  318. get_func(amax, a+len); \
  319. get_func(bmax, b+len); \
  320. amin = min(amin, bmin); \
  321. amax = max(amax, bmax); \
  322. store_func(c, amin); \
  323. store_func(c+len, amax); \
  324. }
  325. /*
  326. Creates common minimal bounding rectungle
  327. for two input rectagnles a and b
  328. Result is written to c
  329. */
  330. int rtree_combine_rect(HA_KEYSEG *keyseg, uchar* a, uchar* b, uchar* c,
  331. uint key_length)
  332. {
  333. for ( ; (int) key_length > 0 ; keyseg += 2)
  334. {
  335. uint32 keyseg_length;
  336. switch ((enum ha_base_keytype) keyseg->type) {
  337. case HA_KEYTYPE_INT8:
  338. RT_COMB_KORR(int8, mi_sint1korr, mi_int1store, 1);
  339. break;
  340. case HA_KEYTYPE_BINARY:
  341. RT_COMB_KORR(uint8, mi_uint1korr, mi_int1store, 1);
  342. break;
  343. case HA_KEYTYPE_SHORT_INT:
  344. RT_COMB_KORR(int16, mi_sint2korr, mi_int2store, 2);
  345. break;
  346. case HA_KEYTYPE_USHORT_INT:
  347. RT_COMB_KORR(uint16, mi_uint2korr, mi_int2store, 2);
  348. break;
  349. case HA_KEYTYPE_INT24:
  350. RT_COMB_KORR(int32, mi_sint3korr, mi_int3store, 3);
  351. break;
  352. case HA_KEYTYPE_UINT24:
  353. RT_COMB_KORR(uint32, mi_uint3korr, mi_int3store, 3);
  354. break;
  355. case HA_KEYTYPE_LONG_INT:
  356. RT_COMB_KORR(int32, mi_sint4korr, mi_int4store, 4);
  357. break;
  358. case HA_KEYTYPE_ULONG_INT:
  359. RT_COMB_KORR(uint32, mi_uint4korr, mi_int4store, 4);
  360. break;
  361. #ifdef HAVE_LONG_LONG
  362. case HA_KEYTYPE_LONGLONG:
  363. RT_COMB_KORR(longlong, mi_sint8korr, mi_int8store, 8);
  364. break;
  365. case HA_KEYTYPE_ULONGLONG:
  366. RT_COMB_KORR(ulonglong, mi_uint8korr, mi_int8store, 8);
  367. break;
  368. #endif
  369. case HA_KEYTYPE_FLOAT:
  370. RT_COMB_GET(float, mi_float4get, mi_float4store, 4);
  371. break;
  372. case HA_KEYTYPE_DOUBLE:
  373. RT_COMB_GET(double, mi_float8get, mi_float8store, 8);
  374. break;
  375. case HA_KEYTYPE_END:
  376. return 0;
  377. default:
  378. return 1;
  379. }
  380. keyseg_length= keyseg->length * 2;
  381. key_length-= keyseg_length;
  382. a+= keyseg_length;
  383. b+= keyseg_length;
  384. c+= keyseg_length;
  385. }
  386. return 0;
  387. }
  388. #define RT_OVL_AREA_KORR(type, korr_func, len) \
  389. { \
  390. type amin, amax, bmin, bmax; \
  391. amin = korr_func(a); \
  392. bmin = korr_func(b); \
  393. amax = korr_func(a+len); \
  394. bmax = korr_func(b+len); \
  395. amin = max(amin, bmin); \
  396. amax = min(amax, bmax); \
  397. if (amin >= amax) \
  398. return 0; \
  399. res *= amax - amin; \
  400. }
  401. #define RT_OVL_AREA_GET(type, get_func, len) \
  402. { \
  403. type amin, amax, bmin, bmax; \
  404. get_func(amin, a); \
  405. get_func(bmin, b); \
  406. get_func(amax, a+len); \
  407. get_func(bmax, b+len); \
  408. amin = max(amin, bmin); \
  409. amax = min(amax, bmax); \
  410. if (amin >= amax) \
  411. return 0; \
  412. res *= amax - amin; \
  413. }
  414. /*
  415. Calculates overlapping area of two MBRs a & b
  416. */
  417. double rtree_overlapping_area(HA_KEYSEG *keyseg, uchar* a, uchar* b,
  418. uint key_length)
  419. {
  420. double res = 1;
  421. for (; (int) key_length > 0 ; keyseg += 2)
  422. {
  423. uint32 keyseg_length;
  424. switch ((enum ha_base_keytype) keyseg->type) {
  425. case HA_KEYTYPE_INT8:
  426. RT_OVL_AREA_KORR(int8, mi_sint1korr, 1);
  427. break;
  428. case HA_KEYTYPE_BINARY:
  429. RT_OVL_AREA_KORR(uint8, mi_uint1korr, 1);
  430. break;
  431. case HA_KEYTYPE_SHORT_INT:
  432. RT_OVL_AREA_KORR(int16, mi_sint2korr, 2);
  433. break;
  434. case HA_KEYTYPE_USHORT_INT:
  435. RT_OVL_AREA_KORR(uint16, mi_uint2korr, 2);
  436. break;
  437. case HA_KEYTYPE_INT24:
  438. RT_OVL_AREA_KORR(int32, mi_sint3korr, 3);
  439. break;
  440. case HA_KEYTYPE_UINT24:
  441. RT_OVL_AREA_KORR(uint32, mi_uint3korr, 3);
  442. break;
  443. case HA_KEYTYPE_LONG_INT:
  444. RT_OVL_AREA_KORR(int32, mi_sint4korr, 4);
  445. break;
  446. case HA_KEYTYPE_ULONG_INT:
  447. RT_OVL_AREA_KORR(uint32, mi_uint4korr, 4);
  448. break;
  449. #ifdef HAVE_LONG_LONG
  450. case HA_KEYTYPE_LONGLONG:
  451. RT_OVL_AREA_KORR(longlong, mi_sint8korr, 8);
  452. break;
  453. case HA_KEYTYPE_ULONGLONG:
  454. RT_OVL_AREA_KORR(longlong, mi_sint8korr, 8);
  455. break;
  456. #endif
  457. case HA_KEYTYPE_FLOAT:
  458. RT_OVL_AREA_GET(float, mi_float4get, 4);
  459. break;
  460. case HA_KEYTYPE_DOUBLE:
  461. RT_OVL_AREA_GET(double, mi_float8get, 8);
  462. break;
  463. case HA_KEYTYPE_END:
  464. return res;
  465. default:
  466. return -1;
  467. }
  468. keyseg_length= keyseg->length * 2;
  469. key_length-= keyseg_length;
  470. a+= keyseg_length;
  471. b+= keyseg_length;
  472. }
  473. return res;
  474. }
  475. #define RT_AREA_INC_KORR(type, korr_func, len) \
  476. { \
  477. type amin, amax, bmin, bmax; \
  478. amin = korr_func(a); \
  479. bmin = korr_func(b); \
  480. amax = korr_func(a+len); \
  481. bmax = korr_func(b+len); \
  482. a_area *= (((double)amax) - ((double)amin)); \
  483. loc_ab_area *= ((double)max(amax, bmax) - (double)min(amin, bmin)); \
  484. }
  485. #define RT_AREA_INC_GET(type, get_func, len)\
  486. {\
  487. type amin, amax, bmin, bmax; \
  488. get_func(amin, a); \
  489. get_func(bmin, b); \
  490. get_func(amax, a+len); \
  491. get_func(bmax, b+len); \
  492. a_area *= (((double)amax) - ((double)amin)); \
  493. loc_ab_area *= ((double)max(amax, bmax) - (double)min(amin, bmin)); \
  494. }
  495. /*
  496. Calculates MBR_AREA(a+b) - MBR_AREA(a)
  497. */
  498. double rtree_area_increase(HA_KEYSEG *keyseg, uchar* a, uchar* b,
  499. uint key_length, double *ab_area)
  500. {
  501. double a_area= 1.0;
  502. double loc_ab_area= 1.0;
  503. *ab_area= 1.0;
  504. for (; (int)key_length > 0; keyseg += 2)
  505. {
  506. uint32 keyseg_length;
  507. if (keyseg->null_bit) /* Handle NULL part */
  508. return -1;
  509. switch ((enum ha_base_keytype) keyseg->type) {
  510. case HA_KEYTYPE_INT8:
  511. RT_AREA_INC_KORR(int8, mi_sint1korr, 1);
  512. break;
  513. case HA_KEYTYPE_BINARY:
  514. RT_AREA_INC_KORR(uint8, mi_uint1korr, 1);
  515. break;
  516. case HA_KEYTYPE_SHORT_INT:
  517. RT_AREA_INC_KORR(int16, mi_sint2korr, 2);
  518. break;
  519. case HA_KEYTYPE_USHORT_INT:
  520. RT_AREA_INC_KORR(uint16, mi_uint2korr, 2);
  521. break;
  522. case HA_KEYTYPE_INT24:
  523. RT_AREA_INC_KORR(int32, mi_sint3korr, 3);
  524. break;
  525. case HA_KEYTYPE_UINT24:
  526. RT_AREA_INC_KORR(int32, mi_uint3korr, 3);
  527. break;
  528. case HA_KEYTYPE_LONG_INT:
  529. RT_AREA_INC_KORR(int32, mi_sint4korr, 4);
  530. break;
  531. case HA_KEYTYPE_ULONG_INT:
  532. RT_AREA_INC_KORR(uint32, mi_uint4korr, 4);
  533. break;
  534. #ifdef HAVE_LONG_LONG
  535. case HA_KEYTYPE_LONGLONG:
  536. RT_AREA_INC_KORR(longlong, mi_sint8korr, 8);
  537. break;
  538. case HA_KEYTYPE_ULONGLONG:
  539. RT_AREA_INC_KORR(longlong, mi_sint8korr, 8);
  540. break;
  541. #endif
  542. case HA_KEYTYPE_FLOAT:
  543. RT_AREA_INC_GET(float, mi_float4get, 4);
  544. break;
  545. case HA_KEYTYPE_DOUBLE:
  546. RT_AREA_INC_GET(double, mi_float8get, 8);
  547. break;
  548. case HA_KEYTYPE_END:
  549. goto safe_end;
  550. default:
  551. return -1;
  552. }
  553. keyseg_length= keyseg->length * 2;
  554. key_length-= keyseg_length;
  555. a+= keyseg_length;
  556. b+= keyseg_length;
  557. }
  558. safe_end:
  559. *ab_area= loc_ab_area;
  560. return loc_ab_area - a_area;
  561. }
  562. #define RT_PERIM_INC_KORR(type, korr_func, len) \
  563. { \
  564. type amin, amax, bmin, bmax; \
  565. amin = korr_func(a); \
  566. bmin = korr_func(b); \
  567. amax = korr_func(a+len); \
  568. bmax = korr_func(b+len); \
  569. a_perim+= (((double)amax) - ((double)amin)); \
  570. *ab_perim+= ((double)max(amax, bmax) - (double)min(amin, bmin)); \
  571. }
  572. #define RT_PERIM_INC_GET(type, get_func, len)\
  573. {\
  574. type amin, amax, bmin, bmax; \
  575. get_func(amin, a); \
  576. get_func(bmin, b); \
  577. get_func(amax, a+len); \
  578. get_func(bmax, b+len); \
  579. a_perim+= (((double)amax) - ((double)amin)); \
  580. *ab_perim+= ((double)max(amax, bmax) - (double)min(amin, bmin)); \
  581. }
  582. /*
  583. Calculates MBR_PERIMETER(a+b) - MBR_PERIMETER(a)
  584. */
  585. double rtree_perimeter_increase(HA_KEYSEG *keyseg, uchar* a, uchar* b,
  586. uint key_length, double *ab_perim)
  587. {
  588. double a_perim = 0.0;
  589. *ab_perim= 0.0;
  590. for (; (int)key_length > 0; keyseg += 2)
  591. {
  592. uint32 keyseg_length;
  593. if (keyseg->null_bit) /* Handle NULL part */
  594. return -1;
  595. switch ((enum ha_base_keytype) keyseg->type) {
  596. case HA_KEYTYPE_INT8:
  597. RT_PERIM_INC_KORR(int8, mi_sint1korr, 1);
  598. break;
  599. case HA_KEYTYPE_BINARY:
  600. RT_PERIM_INC_KORR(uint8, mi_uint1korr, 1);
  601. break;
  602. case HA_KEYTYPE_SHORT_INT:
  603. RT_PERIM_INC_KORR(int16, mi_sint2korr, 2);
  604. break;
  605. case HA_KEYTYPE_USHORT_INT:
  606. RT_PERIM_INC_KORR(uint16, mi_uint2korr, 2);
  607. break;
  608. case HA_KEYTYPE_INT24:
  609. RT_PERIM_INC_KORR(int32, mi_sint3korr, 3);
  610. break;
  611. case HA_KEYTYPE_UINT24:
  612. RT_PERIM_INC_KORR(int32, mi_uint3korr, 3);
  613. break;
  614. case HA_KEYTYPE_LONG_INT:
  615. RT_PERIM_INC_KORR(int32, mi_sint4korr, 4);
  616. break;
  617. case HA_KEYTYPE_ULONG_INT:
  618. RT_PERIM_INC_KORR(uint32, mi_uint4korr, 4);
  619. break;
  620. #ifdef HAVE_LONG_LONG
  621. case HA_KEYTYPE_LONGLONG:
  622. RT_PERIM_INC_KORR(longlong, mi_sint8korr, 8);
  623. break;
  624. case HA_KEYTYPE_ULONGLONG:
  625. RT_PERIM_INC_KORR(longlong, mi_sint8korr, 8);
  626. break;
  627. #endif
  628. case HA_KEYTYPE_FLOAT:
  629. RT_PERIM_INC_GET(float, mi_float4get, 4);
  630. break;
  631. case HA_KEYTYPE_DOUBLE:
  632. RT_PERIM_INC_GET(double, mi_float8get, 8);
  633. break;
  634. case HA_KEYTYPE_END:
  635. return *ab_perim - a_perim;
  636. default:
  637. return -1;
  638. }
  639. keyseg_length= keyseg->length * 2;
  640. key_length-= keyseg_length;
  641. a+= keyseg_length;
  642. b+= keyseg_length;
  643. }
  644. return *ab_perim - a_perim;
  645. }
  646. #define RT_PAGE_MBR_KORR(type, korr_func, store_func, len) \
  647. { \
  648. type amin, amax, bmin, bmax; \
  649. amin = korr_func(k + inc); \
  650. amax = korr_func(k + inc + len); \
  651. k = rt_PAGE_NEXT_KEY(k, k_len, nod_flag); \
  652. for (; k < last; k = rt_PAGE_NEXT_KEY(k, k_len, nod_flag)) \
  653. { \
  654. bmin = korr_func(k + inc); \
  655. bmax = korr_func(k + inc + len); \
  656. if (amin > bmin) \
  657. amin = bmin; \
  658. if (amax < bmax) \
  659. amax = bmax; \
  660. } \
  661. store_func(c, amin); \
  662. c += len; \
  663. store_func(c, amax); \
  664. c += len; \
  665. inc += 2 * len; \
  666. }
  667. #define RT_PAGE_MBR_GET(type, get_func, store_func, len) \
  668. { \
  669. type amin, amax, bmin, bmax; \
  670. get_func(amin, k + inc); \
  671. get_func(amax, k + inc + len); \
  672. k = rt_PAGE_NEXT_KEY(k, k_len, nod_flag); \
  673. for (; k < last; k = rt_PAGE_NEXT_KEY(k, k_len, nod_flag)) \
  674. { \
  675. get_func(bmin, k + inc); \
  676. get_func(bmax, k + inc + len); \
  677. if (amin > bmin) \
  678. amin = bmin; \
  679. if (amax < bmax) \
  680. amax = bmax; \
  681. } \
  682. store_func(c, amin); \
  683. c += len; \
  684. store_func(c, amax); \
  685. c += len; \
  686. inc += 2 * len; \
  687. }
  688. /*
  689. Calculates key page total MBR = MBR(key1) + MBR(key2) + ...
  690. */
  691. int rtree_page_mbr(MI_INFO *info, HA_KEYSEG *keyseg, uchar *page_buf,
  692. uchar *c, uint key_length)
  693. {
  694. uint inc = 0;
  695. uint k_len = key_length;
  696. uint nod_flag = mi_test_if_nod(page_buf);
  697. uchar *k;
  698. uchar *last = rt_PAGE_END(page_buf);
  699. for (; (int)key_length > 0; keyseg += 2)
  700. {
  701. key_length -= keyseg->length * 2;
  702. /* Handle NULL part */
  703. if (keyseg->null_bit)
  704. {
  705. return 1;
  706. }
  707. k = rt_PAGE_FIRST_KEY(page_buf, nod_flag);
  708. switch ((enum ha_base_keytype) keyseg->type) {
  709. case HA_KEYTYPE_INT8:
  710. RT_PAGE_MBR_KORR(int8, mi_sint1korr, mi_int1store, 1);
  711. break;
  712. case HA_KEYTYPE_BINARY:
  713. RT_PAGE_MBR_KORR(uint8, mi_uint1korr, mi_int1store, 1);
  714. break;
  715. case HA_KEYTYPE_SHORT_INT:
  716. RT_PAGE_MBR_KORR(int16, mi_sint2korr, mi_int2store, 2);
  717. break;
  718. case HA_KEYTYPE_USHORT_INT:
  719. RT_PAGE_MBR_KORR(uint16, mi_uint2korr, mi_int2store, 2);
  720. break;
  721. case HA_KEYTYPE_INT24:
  722. RT_PAGE_MBR_KORR(int32, mi_sint3korr, mi_int3store, 3);
  723. break;
  724. case HA_KEYTYPE_UINT24:
  725. RT_PAGE_MBR_KORR(uint32, mi_uint3korr, mi_int3store, 3);
  726. break;
  727. case HA_KEYTYPE_LONG_INT:
  728. RT_PAGE_MBR_KORR(int32, mi_sint4korr, mi_int4store, 4);
  729. break;
  730. case HA_KEYTYPE_ULONG_INT:
  731. RT_PAGE_MBR_KORR(uint32, mi_uint4korr, mi_int4store, 4);
  732. break;
  733. #ifdef HAVE_LONG_LONG
  734. case HA_KEYTYPE_LONGLONG:
  735. RT_PAGE_MBR_KORR(longlong, mi_sint8korr, mi_int8store, 8);
  736. break;
  737. case HA_KEYTYPE_ULONGLONG:
  738. RT_PAGE_MBR_KORR(ulonglong, mi_uint8korr, mi_int8store, 8);
  739. break;
  740. #endif
  741. case HA_KEYTYPE_FLOAT:
  742. RT_PAGE_MBR_GET(float, mi_float4get, mi_float4store, 4);
  743. break;
  744. case HA_KEYTYPE_DOUBLE:
  745. RT_PAGE_MBR_GET(double, mi_float8get, mi_float8store, 8);
  746. break;
  747. case HA_KEYTYPE_END:
  748. return 0;
  749. default:
  750. return 1;
  751. }
  752. }
  753. return 0;
  754. }
  755. #endif /*HAVE_RTREE_KEYS*/