mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
f252f9248a
The following type conversions was done: - Changed byte to uchar - Changed gptr to uchar* - Change my_string to char * - Change my_size_t to size_t - Change size_s to size_t Removed declaration of byte, gptr, my_string, my_size_t and size_s. Following function parameter changes was done: - All string functions in mysys/strings was changed to use size_t instead of uint for string lengths. - All read()/write() functions changed to use size_t (including vio). - All protocoll functions changed to use size_t instead of uint - Functions that used a pointer to a string length was changed to use size_t* - Changed malloc(), free() and related functions from using gptr to use void * as this requires fewer casts in the code and is more in line with how the standard functions work. - Added extra length argument to dirname_part() to return the length of the created string. - Changed (at least) following functions to take uchar* as argument: - db_dump() - my_net_write() - net_write_command() - net_store_data() - DBUG_DUMP() - decimal2bin() & bin2decimal() - Changed my_compress() and my_uncompress() to use size_t. Changed one argument to my_uncompress() from a pointer to a value as we only return one value (makes function easier to use). - Changed type of 'pack_data' argument to packfrm() to avoid casts. - Changed in readfrm() and writefrom(), ha_discover and handler::discover() the type for argument 'frmdata' to uchar** to avoid casts. - Changed most Field functions to use uchar* instead of char* (reduced a lot of casts). - Changed field->val_xxx(xxx, new_ptr) to take const pointers. Other changes: - Removed a lot of not needed casts - Added a few new cast required by other changes - Added some cast to my_multi_malloc() arguments for safety (as string lengths needs to be uint, not size_t). - Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done explicitely as this conflict was often hided by casting the function to hash_get_key). - Changed some buffers to memory regions to uchar* to avoid casts. - Changed some string lengths from uint to size_t. - Changed field->ptr to be uchar* instead of char*. This allowed us to get rid of a lot of casts. - Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar - Include zlib.h in some files as we needed declaration of crc32() - Changed MY_FILE_ERROR to be (size_t) -1. - Changed many variables to hold the result of my_read() / my_write() to be size_t. This was needed to properly detect errors (which are returned as (size_t) -1). - Removed some very old VMS code - Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix) - Removed windows specific code to restore cursor position as this causes slowdown on windows and we should not mix read() and pread() calls anyway as this is not thread safe. Updated function comment to reflect this. Changed function that depended on original behavior of my_pwrite() to itself restore the cursor position (one such case). - Added some missing checking of return value of malloc(). - Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow. - Changed type of table_def::m_size from my_size_t to ulong to reflect that m_size is the number of elements in the array, not a string/memory length. - Moved THD::max_row_length() to table.cc (as it's not depending on THD). Inlined max_row_length_blob() into this function. - More function comments - Fixed some compiler warnings when compiled without partitions. - Removed setting of LEX_STRING() arguments in declaration (portability fix). - Some trivial indentation/variable name changes. - Some trivial code simplifications: - Replaced some calls to alloc_root + memcpy to use strmake_root()/strdup_root(). - Changed some calls from memdup() to strmake() (Safety fix) - Simpler loops in client-simple.c BitKeeper/etc/ignore: added libmysqld/ha_ndbcluster_cond.cc --- added debian/defs.mk debian/control client/completion_hash.cc: Remove not needed casts client/my_readline.h: Remove some old types client/mysql.cc: Simplify types client/mysql_upgrade.c: Remove some old types Update call to dirname_part client/mysqladmin.cc: Remove some old types client/mysqlbinlog.cc: Remove some old types Change some buffers to be uchar to avoid casts client/mysqlcheck.c: Remove some old types client/mysqldump.c: Remove some old types Remove some not needed casts Change some string lengths to size_t client/mysqlimport.c: Remove some old types client/mysqlshow.c: Remove some old types client/mysqlslap.c: Remove some old types Remove some not needed casts client/mysqltest.c: Removed some old types Removed some not needed casts Updated hash-get-key function arguments Updated parameters to dirname_part() client/readline.cc: Removed some old types Removed some not needed casts Changed some string lengths to use size_t client/sql_string.cc: Removed some old types dbug/dbug.c: Removed some old types Changed some string lengths to use size_t Changed some prototypes to avoid casts extra/comp_err.c: Removed some old types extra/innochecksum.c: Removed some old types extra/my_print_defaults.c: Removed some old types extra/mysql_waitpid.c: Removed some old types extra/perror.c: Removed some old types extra/replace.c: Removed some old types Updated parameters to dirname_part() extra/resolve_stack_dump.c: Removed some old types extra/resolveip.c: Removed some old types include/config-win.h: Removed some old types include/decimal.h: Changed binary strings to be uchar* instead of char* include/ft_global.h: Removed some old types include/hash.h: Removed some old types include/heap.h: Removed some old types Changed records_under_level to be 'ulong' instead of 'uint' to clarify usage of variable include/keycache.h: Removed some old types include/m_ctype.h: Removed some old types Changed some string lengths to use size_t Changed character length functions to return uint unsigned char -> uchar include/m_string.h: Removed some old types Changed some string lengths to use size_t include/my_alloc.h: Changed some string lengths to use size_t include/my_base.h: Removed some old types include/my_dbug.h: Removed some old types Changed some string lengths to use size_t Changed db_dump() to take uchar * as argument for memory to reduce number of casts in usage include/my_getopt.h: Removed some old types include/my_global.h: Removed old types: my_size_t -> size_t byte -> uchar gptr -> uchar * include/my_list.h: Removed some old types include/my_nosys.h: Removed some old types include/my_pthread.h: Removed some old types include/my_sys.h: Removed some old types Changed MY_FILE_ERROR to be in line with new definitions of my_write()/my_read() Changed some string lengths to use size_t my_malloc() / my_free() now uses void * Updated parameters to dirname_part() & my_uncompress() include/my_tree.h: Removed some old types include/my_trie.h: Removed some old types include/my_user.h: Changed some string lengths to use size_t include/my_vle.h: Removed some old types include/my_xml.h: Removed some old types Changed some string lengths to use size_t include/myisam.h: Removed some old types include/myisammrg.h: Removed some old types include/mysql.h: Removed some old types Changed byte streams to use uchar* instead of char* include/mysql_com.h: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts include/queues.h: Removed some old types include/sql_common.h: Removed some old types include/sslopt-longopts.h: Removed some old types include/violite.h: Removed some old types Changed some string lengths to use size_t libmysql/client_settings.h: Removed some old types libmysql/libmysql.c: Removed some old types libmysql/manager.c: Removed some old types libmysqld/emb_qcache.cc: Removed some old types libmysqld/emb_qcache.h: Removed some old types libmysqld/lib_sql.cc: Removed some old types Removed some not needed casts Changed some buffers to be uchar* to avoid casts true -> TRUE, false -> FALSE mysys/array.c: Removed some old types mysys/charset.c: Changed some string lengths to use size_t mysys/checksum.c: Include zlib to get definition for crc32 Removed some old types mysys/default.c: Removed some old types Changed some string lengths to use size_t mysys/default_modify.c: Changed some string lengths to use size_t Removed some not needed casts mysys/hash.c: Removed some old types Changed some string lengths to use size_t Note: Prototype of hash_key() has changed which may cause problems if client uses hash_init() with a cast for the hash-get-key function. hash_element now takes 'ulong' as the index type (cleanup) mysys/list.c: Removed some old types mysys/mf_cache.c: Changed some string lengths to use size_t mysys/mf_dirname.c: Removed some old types Changed some string lengths to use size_t Added argument to dirname_part() to avoid calculation of length for 'to' mysys/mf_fn_ext.c: Removed some old types Updated parameters to dirname_part() mysys/mf_format.c: Removed some old types Changed some string lengths to use size_t mysys/mf_getdate.c: Removed some old types mysys/mf_iocache.c: Removed some old types Changed some string lengths to use size_t Changed calculation of 'max_length' to be done the same way in all functions mysys/mf_iocache2.c: Removed some old types Changed some string lengths to use size_t Clean up comments Removed not needed indentation mysys/mf_keycache.c: Removed some old types mysys/mf_keycaches.c: Removed some old types mysys/mf_loadpath.c: Removed some old types mysys/mf_pack.c: Removed some old types Changed some string lengths to use size_t Removed some not needed casts Removed very old VMS code Updated parameters to dirname_part() Use result of dirnam_part() to remove call to strcat() mysys/mf_path.c: Removed some old types mysys/mf_radix.c: Removed some old types mysys/mf_same.c: Removed some old types mysys/mf_sort.c: Removed some old types mysys/mf_soundex.c: Removed some old types mysys/mf_strip.c: Removed some old types mysys/mf_tempdir.c: Removed some old types mysys/mf_unixpath.c: Removed some old types mysys/mf_wfile.c: Removed some old types mysys/mulalloc.c: Removed some old types mysys/my_alloc.c: Removed some old types Changed some string lengths to use size_t Use void* as type for allocated memory area Removed some not needed casts Changed argument 'Size' to 'length' according coding guidelines mysys/my_chsize.c: Changed some buffers to be uchar* to avoid casts mysys/my_compress.c: More comments Removed some old types Changed string lengths to use size_t Changed arguments to my_uncompress() to make them easier to understand Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix) Changed type of 'pack_data' argument to packfrm() to avoid casts. mysys/my_conio.c: Changed some string lengths to use size_t mysys/my_create.c: Removed some old types mysys/my_div.c: Removed some old types mysys/my_error.c: Removed some old types mysys/my_fopen.c: Removed some old types mysys/my_fstream.c: Removed some old types Changed some string lengths to use size_t writen -> written mysys/my_getopt.c: Removed some old types mysys/my_getwd.c: Removed some old types More comments mysys/my_init.c: Removed some old types mysys/my_largepage.c: Removed some old types Changed some string lengths to use size_t mysys/my_lib.c: Removed some old types mysys/my_lockmem.c: Removed some old types mysys/my_malloc.c: Removed some old types Changed malloc(), free() and related functions to use void * Changed all functions to use size_t mysys/my_memmem.c: Indentation cleanup mysys/my_once.c: Removed some old types Changed malloc(), free() and related functions to use void * mysys/my_open.c: Removed some old types mysys/my_pread.c: Removed some old types Changed all functions to use size_t Added comment for how my_pread() / my_pwrite() are supposed to work. Removed windows specific code to restore cursor position as this causes slowdown on windows and we should not mix read() and pread() calls anyway as this is not thread safe. (If we ever would really need this, it should be enabled only with a flag argument) mysys/my_quick.c: Removed some old types Changed all functions to use size_t mysys/my_read.c: Removed some old types Changed all functions to use size_t mysys/my_realloc.c: Removed some old types Use void* as type for allocated memory area Changed all functions to use size_t mysys/my_static.c: Removed some old types mysys/my_static.h: Removed some old types mysys/my_vle.c: Removed some old types mysys/my_wincond.c: Removed some old types mysys/my_windac.c: Removed some old types mysys/my_write.c: Removed some old types Changed all functions to use size_t mysys/ptr_cmp.c: Removed some old types Changed all functions to use size_t mysys/queues.c: Removed some old types mysys/safemalloc.c: Removed some old types Changed malloc(), free() and related functions to use void * Changed all functions to use size_t mysys/string.c: Removed some old types Changed all functions to use size_t mysys/testhash.c: Removed some old types mysys/thr_alarm.c: Removed some old types mysys/thr_lock.c: Removed some old types mysys/tree.c: Removed some old types mysys/trie.c: Removed some old types mysys/typelib.c: Removed some old types plugin/daemon_example/daemon_example.cc: Removed some old types regex/reginit.c: Removed some old types server-tools/instance-manager/buffer.cc: Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/buffer.h: Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/commands.cc: Removed some old types Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/instance_map.cc: Removed some old types Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/instance_options.cc: Changed buffer to be of type uchar* Replaced alloc_root + strcpy() with strdup_root() server-tools/instance-manager/mysql_connection.cc: Changed buffer to be of type uchar* server-tools/instance-manager/options.cc: Removed some old types server-tools/instance-manager/parse.cc: Changed some string lengths to use size_t server-tools/instance-manager/parse.h: Removed some old types Changed some string lengths to use size_t server-tools/instance-manager/protocol.cc: Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t server-tools/instance-manager/protocol.h: Changed some string lengths to use size_t server-tools/instance-manager/user_map.cc: Removed some old types Changed some string lengths to use size_t sql/derror.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t sql/discover.cc: Changed in readfrm() and writefrom() the type for argument 'frmdata' to uchar** to avoid casts Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts sql/event_data_objects.cc: Removed some old types Added missing casts for alloc() and sprintf() sql/event_db_repository.cc: Changed some buffers to be uchar* to avoid casts Added missing casts for sprintf() sql/event_queue.cc: Removed some old types sql/field.cc: Removed some old types Changed memory buffers to be uchar* Changed some string lengths to use size_t Removed a lot of casts Safety fix in Field_blob::val_decimal() to not access zero pointer sql/field.h: Removed some old types Changed memory buffers to be uchar* (except of store() as this would have caused too many other changes). Changed some string lengths to use size_t Removed some not needed casts Changed val_xxx(xxx, new_ptr) to take const pointers sql/field_conv.cc: Removed some old types Added casts required because memory area pointers are now uchar* sql/filesort.cc: Initalize variable that was used unitialized in error conditions sql/gen_lex_hash.cc: Removed some old types Changed memory buffers to be uchar* Changed some string lengths to use size_t Removed a lot of casts Safety fix in Field_blob::val_decimal() to not access zero pointer sql/gstream.h: Added required cast sql/ha_ndbcluster.cc: Removed some old types Updated hash-get-key function arguments Changed some buffers to be uchar* to avoid casts Added required casts Removed some not needed casts sql/ha_ndbcluster.h: Removed some old types sql/ha_ndbcluster_binlog.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Replaced sql_alloc() + memcpy() + set end 0 with sql_strmake() Changed some string lengths to use size_t Added missing casts for alloc() and sprintf() sql/ha_ndbcluster_binlog.h: Removed some old types sql/ha_ndbcluster_cond.cc: Removed some old types Removed some not needed casts sql/ha_ndbcluster_cond.h: Removed some old types sql/ha_partition.cc: Removed some old types Changed prototype for change_partition() to avoid casts sql/ha_partition.h: Removed some old types sql/handler.cc: Removed some old types Changed some string lengths to use size_t sql/handler.h: Removed some old types Changed some string lengths to use size_t Changed type for 'frmblob' parameter for discover() and ha_discover() to get fewer casts sql/hash_filo.h: Removed some old types Changed all functions to use size_t sql/hostname.cc: Removed some old types sql/item.cc: Removed some old types Changed some string lengths to use size_t Use strmake() instead of memdup() to create a null terminated string. Updated calls to new Field() sql/item.h: Removed some old types Changed malloc(), free() and related functions to use void * Changed some buffers to be uchar* to avoid casts sql/item_cmpfunc.cc: Removed some old types Changed some buffers to be uchar* to avoid casts sql/item_cmpfunc.h: Removed some old types sql/item_create.cc: Removed some old types sql/item_func.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts Added test for failing alloc() in init_result_field() Remove old confusing comment Fixed compiler warning sql/item_func.h: Removed some old types sql/item_row.cc: Removed some old types sql/item_row.h: Removed some old types sql/item_strfunc.cc: Include zlib (needed becasue we call crc32) Removed some old types sql/item_strfunc.h: Removed some old types Changed some types to match new function prototypes sql/item_subselect.cc: Removed some old types sql/item_subselect.h: Removed some old types sql/item_sum.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/item_sum.h: Removed some old types sql/item_timefunc.cc: Removed some old types Changed some string lengths to use size_t sql/item_timefunc.h: Removed some old types sql/item_xmlfunc.cc: Changed some string lengths to use size_t sql/item_xmlfunc.h: Removed some old types sql/key.cc: Removed some old types Removed some not needed casts sql/lock.cc: Removed some old types Added some cast to my_multi_malloc() arguments for safety sql/log.cc: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts Changed usage of pwrite() to not assume it holds the cursor position for the file Made usage of my_read() safer sql/log_event.cc: Removed some old types Added checking of return value of malloc() in pack_info() Changed some buffers to be uchar* to avoid casts Removed some 'const' to avoid casts Added missing casts for alloc() and sprintf() Added required casts Removed some not needed casts Added some cast to my_multi_malloc() arguments for safety sql/log_event.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/log_event_old.cc: Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/log_event_old.h: Changed some buffers to be uchar* to avoid casts sql/mf_iocache.cc: Removed some old types sql/my_decimal.cc: Changed memory area to use uchar* sql/my_decimal.h: Changed memory area to use uchar* sql/mysql_priv.h: Removed some old types Changed malloc(), free() and related functions to use void * Changed some string lengths to use size_t Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid long overflow Changed some buffers to be uchar* to avoid casts sql/mysqld.cc: Removed some old types sql/net_serv.cc: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts Ensure that vio_read()/vio_write() return values are stored in a size_t variable Removed some not needed casts sql/opt_range.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/opt_range.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/opt_sum.cc: Removed some old types Removed some not needed casts sql/parse_file.cc: Removed some old types Changed some string lengths to use size_t Changed alloc_root + memcpy + set end 0 -> strmake_root() sql/parse_file.h: Removed some old types sql/partition_info.cc: Removed some old types Added missing casts for alloc() Changed some buffers to be uchar* to avoid casts sql/partition_info.h: Changed some buffers to be uchar* to avoid casts sql/protocol.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/protocol.h: Removed some old types Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t sql/records.cc: Removed some old types sql/repl_failsafe.cc: Removed some old types Changed some string lengths to use size_t Added required casts sql/rpl_filter.cc: Removed some old types Updated hash-get-key function arguments Changed some string lengths to use size_t sql/rpl_filter.h: Changed some string lengths to use size_t sql/rpl_injector.h: Removed some old types sql/rpl_record.cc: Removed some old types Removed some not needed casts Changed some buffers to be uchar* to avoid casts sql/rpl_record.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/rpl_record_old.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/rpl_record_old.h: Removed some old types Changed some buffers to be uchar* to avoid cast sql/rpl_rli.cc: Removed some old types sql/rpl_tblmap.cc: Removed some old types sql/rpl_tblmap.h: Removed some old types sql/rpl_utility.cc: Removed some old types sql/rpl_utility.h: Removed some old types Changed type of m_size from my_size_t to ulong to reflect that m_size is the number of elements in the array, not a string/memory length sql/set_var.cc: Removed some old types Updated parameters to dirname_part() sql/set_var.h: Removed some old types sql/slave.cc: Removed some old types Changed some string lengths to use size_t sql/slave.h: Removed some old types sql/sp.cc: Removed some old types Added missing casts for printf() sql/sp.h: Removed some old types Updated hash-get-key function arguments sql/sp_cache.cc: Removed some old types Added missing casts for printf() Updated hash-get-key function arguments sql/sp_head.cc: Removed some old types Added missing casts for alloc() and printf() Added required casts Updated hash-get-key function arguments sql/sp_head.h: Removed some old types sql/sp_pcontext.cc: Removed some old types sql/sp_pcontext.h: Removed some old types sql/sql_acl.cc: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts Removed some not needed casts Added required casts sql/sql_analyse.cc: Changed some buffers to be uchar* to avoid casts sql/sql_analyse.h: Changed some buffers to be uchar* to avoid casts sql/sql_array.h: Removed some old types sql/sql_base.cc: Removed some old types Updated hash-get-key function arguments sql/sql_binlog.cc: Removed some old types Added missing casts for printf() sql/sql_cache.cc: Removed some old types Updated hash-get-key function arguments Removed some not needed casts Changed some string lengths to use size_t sql/sql_cache.h: Removed some old types Removed reference to not existing function cache_key() Updated hash-get-key function arguments sql/sql_class.cc: Removed some old types Updated hash-get-key function arguments Added missing casts for alloc() Updated hash-get-key function arguments Moved THD::max_row_length() to table.cc (as it's not depending on THD) Removed some not needed casts sql/sql_class.h: Removed some old types Changed malloc(), free() and related functions to use void * Removed some not needed casts Changed some string lengths to use size_t Moved max_row_length and max_row_length_blob() to table.cc, as they are not depending on THD sql/sql_connect.cc: Removed some old types Added required casts sql/sql_db.cc: Removed some old types Removed some not needed casts Added some cast to my_multi_malloc() arguments for safety Added missing casts for alloc() sql/sql_delete.cc: Removed some old types sql/sql_handler.cc: Removed some old types Updated hash-get-key function arguments Added some cast to my_multi_malloc() arguments for safety sql/sql_help.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/sql_insert.cc: Removed some old types Added missing casts for alloc() and printf() sql/sql_lex.cc: Removed some old types sql/sql_lex.h: Removed some old types Removed some not needed casts sql/sql_list.h: Removed some old types Removed some not needed casts sql/sql_load.cc: Removed some old types Removed compiler warning sql/sql_manager.cc: Removed some old types sql/sql_map.cc: Removed some old types sql/sql_map.h: Removed some old types sql/sql_olap.cc: Removed some old types sql/sql_parse.cc: Removed some old types Trivial move of code lines to make things more readable Changed some string lengths to use size_t Added missing casts for alloc() sql/sql_partition.cc: Removed some old types Removed compiler warnings about not used functions Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/sql_partition.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/sql_plugin.cc: Removed some old types Added missing casts for alloc() Updated hash-get-key function arguments sql/sql_prepare.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Added missing casts for alloc() and printf() sql-common/client.c: Removed some old types Changed some memory areas to use uchar* sql-common/my_user.c: Changed some string lengths to use size_t sql-common/pack.c: Changed some buffers to be uchar* to avoid casts sql/sql_repl.cc: Added required casts Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t sql/sql_select.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some old types sql/sql_select.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/sql_servers.cc: Removed some old types Updated hash-get-key function arguments sql/sql_show.cc: Removed some old types Added missing casts for alloc() Removed some not needed casts sql/sql_string.cc: Removed some old types Added required casts sql/sql_table.cc: Removed some old types Removed compiler warning about not used variable Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/sql_test.cc: Removed some old types sql/sql_trigger.cc: Removed some old types Added missing casts for alloc() sql/sql_udf.cc: Removed some old types Updated hash-get-key function arguments sql/sql_union.cc: Removed some old types sql/sql_update.cc: Removed some old types Removed some not needed casts sql/sql_view.cc: Removed some old types sql/sql_yacc.yy: Removed some old types Changed some string lengths to use size_t Added missing casts for alloc() sql/stacktrace.c: Removed some old types sql/stacktrace.h: Removed some old types sql/structs.h: Removed some old types sql/table.cc: Removed some old types Updated hash-get-key function arguments Changed some buffers to be uchar* to avoid casts Removed setting of LEX_STRING() arguments in declaration Added required casts More function comments Moved max_row_length() here from sql_class.cc/sql_class.h sql/table.h: Removed some old types Changed some string lengths to use size_t sql/thr_malloc.cc: Use void* as type for allocated memory area Changed all functions to use size_t sql/tzfile.h: Changed some buffers to be uchar* to avoid casts sql/tztime.cc: Changed some buffers to be uchar* to avoid casts Updated hash-get-key function arguments Added missing casts for alloc() Removed some not needed casts sql/uniques.cc: Removed some old types Removed some not needed casts sql/unireg.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts Added missing casts for alloc() storage/archive/archive_reader.c: Removed some old types storage/archive/azio.c: Removed some old types Removed some not needed casts storage/archive/ha_archive.cc: Removed some old types Changed type for 'frmblob' in archive_discover() to match handler Updated hash-get-key function arguments Removed some not needed casts storage/archive/ha_archive.h: Removed some old types storage/blackhole/ha_blackhole.cc: Removed some old types storage/blackhole/ha_blackhole.h: Removed some old types storage/csv/ha_tina.cc: Removed some old types Updated hash-get-key function arguments Changed some buffers to be uchar* to avoid casts storage/csv/ha_tina.h: Removed some old types Removed some not needed casts storage/csv/transparent_file.cc: Removed some old types Changed type of 'bytes_read' to be able to detect read errors Fixed indentation storage/csv/transparent_file.h: Removed some old types storage/example/ha_example.cc: Removed some old types Updated hash-get-key function arguments storage/example/ha_example.h: Removed some old types storage/federated/ha_federated.cc: Removed some old types Updated hash-get-key function arguments Removed some not needed casts storage/federated/ha_federated.h: Removed some old types storage/heap/_check.c: Changed some buffers to be uchar* to avoid casts storage/heap/_rectest.c: Removed some old types storage/heap/ha_heap.cc: Removed some old types storage/heap/ha_heap.h: Removed some old types storage/heap/heapdef.h: Removed some old types storage/heap/hp_block.c: Removed some old types Changed some string lengths to use size_t storage/heap/hp_clear.c: Removed some old types storage/heap/hp_close.c: Removed some old types storage/heap/hp_create.c: Removed some old types storage/heap/hp_delete.c: Removed some old types storage/heap/hp_hash.c: Removed some old types storage/heap/hp_info.c: Removed some old types storage/heap/hp_open.c: Removed some old types storage/heap/hp_rfirst.c: Removed some old types storage/heap/hp_rkey.c: Removed some old types storage/heap/hp_rlast.c: Removed some old types storage/heap/hp_rnext.c: Removed some old types storage/heap/hp_rprev.c: Removed some old types storage/heap/hp_rrnd.c: Removed some old types storage/heap/hp_rsame.c: Removed some old types storage/heap/hp_scan.c: Removed some old types storage/heap/hp_test1.c: Removed some old types storage/heap/hp_test2.c: Removed some old types storage/heap/hp_update.c: Removed some old types storage/heap/hp_write.c: Removed some old types Changed some string lengths to use size_t storage/innobase/handler/ha_innodb.cc: Removed some old types Updated hash-get-key function arguments Added missing casts for alloc() and printf() Removed some not needed casts storage/innobase/handler/ha_innodb.h: Removed some old types storage/myisam/ft_boolean_search.c: Removed some old types storage/myisam/ft_nlq_search.c: Removed some old types storage/myisam/ft_parser.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/ft_static.c: Removed some old types storage/myisam/ft_stopwords.c: Removed some old types storage/myisam/ft_update.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/ftdefs.h: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/fulltext.h: Removed some old types storage/myisam/ha_myisam.cc: Removed some old types storage/myisam/ha_myisam.h: Removed some old types storage/myisam/mi_cache.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/mi_check.c: Removed some old types storage/myisam/mi_checksum.c: Removed some old types storage/myisam/mi_close.c: Removed some old types storage/myisam/mi_create.c: Removed some old types storage/myisam/mi_delete.c: Removed some old types storage/myisam/mi_delete_all.c: Removed some old types storage/myisam/mi_dynrec.c: Removed some old types storage/myisam/mi_extra.c: Removed some old types storage/myisam/mi_key.c: Removed some old types storage/myisam/mi_locking.c: Removed some old types storage/myisam/mi_log.c: Removed some old types storage/myisam/mi_open.c: Removed some old types Removed some not needed casts Check argument of my_write()/my_pwrite() in functions returning int Added casting of string lengths to size_t storage/myisam/mi_packrec.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/mi_page.c: Removed some old types storage/myisam/mi_preload.c: Removed some old types storage/myisam/mi_range.c: Removed some old types storage/myisam/mi_rfirst.c: Removed some old types storage/myisam/mi_rkey.c: Removed some old types storage/myisam/mi_rlast.c: Removed some old types storage/myisam/mi_rnext.c: Removed some old types storage/myisam/mi_rnext_same.c: Removed some old types storage/myisam/mi_rprev.c: Removed some old types storage/myisam/mi_rrnd.c: Removed some old types storage/myisam/mi_rsame.c: Removed some old types storage/myisam/mi_rsamepos.c: Removed some old types storage/myisam/mi_scan.c: Removed some old types storage/myisam/mi_search.c: Removed some old types storage/myisam/mi_static.c: Removed some old types storage/myisam/mi_statrec.c: Removed some old types storage/myisam/mi_test1.c: Removed some old types storage/myisam/mi_test2.c: Removed some old types storage/myisam/mi_test3.c: Removed some old types storage/myisam/mi_unique.c: Removed some old types storage/myisam/mi_update.c: Removed some old types storage/myisam/mi_write.c: Removed some old types storage/myisam/myisam_ftdump.c: Removed some old types storage/myisam/myisamchk.c: Removed some old types storage/myisam/myisamdef.h: Removed some old types storage/myisam/myisamlog.c: Removed some old types Indentation fix storage/myisam/myisampack.c: Removed some old types storage/myisam/rt_index.c: Removed some old types storage/myisam/rt_split.c: Removed some old types storage/myisam/sort.c: Removed some old types storage/myisam/sp_defs.h: Removed some old types storage/myisam/sp_key.c: Removed some old types storage/myisammrg/ha_myisammrg.cc: Removed some old types storage/myisammrg/ha_myisammrg.h: Removed some old types storage/myisammrg/myrg_close.c: Removed some old types storage/myisammrg/myrg_def.h: Removed some old types storage/myisammrg/myrg_delete.c: Removed some old types storage/myisammrg/myrg_open.c: Removed some old types Updated parameters to dirname_part() storage/myisammrg/myrg_queue.c: Removed some old types storage/myisammrg/myrg_rfirst.c: Removed some old types storage/myisammrg/myrg_rkey.c: Removed some old types storage/myisammrg/myrg_rlast.c: Removed some old types storage/myisammrg/myrg_rnext.c: Removed some old types storage/myisammrg/myrg_rnext_same.c: Removed some old types storage/myisammrg/myrg_rprev.c: Removed some old types storage/myisammrg/myrg_rrnd.c: Removed some old types storage/myisammrg/myrg_rsame.c: Removed some old types storage/myisammrg/myrg_update.c: Removed some old types storage/myisammrg/myrg_write.c: Removed some old types storage/ndb/include/util/ndb_opts.h: Removed some old types storage/ndb/src/cw/cpcd/main.cpp: Removed some old types storage/ndb/src/kernel/vm/Configuration.cpp: Removed some old types storage/ndb/src/mgmclient/main.cpp: Removed some old types storage/ndb/src/mgmsrv/InitConfigFileParser.cpp: Removed some old types Removed old disabled code storage/ndb/src/mgmsrv/main.cpp: Removed some old types storage/ndb/src/ndbapi/NdbBlob.cpp: Removed some old types storage/ndb/src/ndbapi/NdbOperationDefine.cpp: Removed not used variable storage/ndb/src/ndbapi/NdbOperationInt.cpp: Added required casts storage/ndb/src/ndbapi/NdbScanOperation.cpp: Added required casts storage/ndb/tools/delete_all.cpp: Removed some old types storage/ndb/tools/desc.cpp: Removed some old types storage/ndb/tools/drop_index.cpp: Removed some old types storage/ndb/tools/drop_tab.cpp: Removed some old types storage/ndb/tools/listTables.cpp: Removed some old types storage/ndb/tools/ndb_config.cpp: Removed some old types storage/ndb/tools/restore/consumer_restore.cpp: Changed some buffers to be uchar* to avoid casts with new defintion of packfrm() storage/ndb/tools/restore/restore_main.cpp: Removed some old types storage/ndb/tools/select_all.cpp: Removed some old types storage/ndb/tools/select_count.cpp: Removed some old types storage/ndb/tools/waiter.cpp: Removed some old types strings/bchange.c: Changed function to use uchar * and size_t strings/bcmp.c: Changed function to use uchar * and size_t strings/bmove512.c: Changed function to use uchar * and size_t strings/bmove_upp.c: Changed function to use uchar * and size_t strings/ctype-big5.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-bin.c: Changed functions to use size_t strings/ctype-cp932.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-czech.c: Fixed indentation Changed functions to use size_t strings/ctype-euc_kr.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-eucjpms.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-gb2312.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-gbk.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-latin1.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-mb.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-simple.c: Changed functions to use size_t Simpler loops for caseup/casedown unsigned int -> uint unsigned char -> uchar strings/ctype-sjis.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-tis620.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-uca.c: Changed functions to use size_t unsigned char -> uchar strings/ctype-ucs2.c: Moved inclusion of stdarg.h to other includes usigned char -> uchar Changed functions to use size_t Changed character length functions to return uint strings/ctype-ujis.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-utf8.c: Changed functions to use size_t unsigned char -> uchar Indentation fixes strings/ctype-win1250ch.c: Indentation fixes Changed functions to use size_t strings/ctype.c: Changed functions to use size_t strings/decimal.c: Changed type for memory argument to uchar * strings/do_ctype.c: Indentation fixes strings/my_strtoll10.c: unsigned char -> uchar strings/my_vsnprintf.c: Changed functions to use size_t strings/r_strinstr.c: Removed some old types Changed functions to use size_t strings/str_test.c: Removed some old types strings/strappend.c: Changed functions to use size_t strings/strcont.c: Removed some old types strings/strfill.c: Removed some old types strings/strinstr.c: Changed functions to use size_t strings/strlen.c: Changed functions to use size_t strings/strmake.c: Changed functions to use size_t strings/strnlen.c: Changed functions to use size_t strings/strnmov.c: Changed functions to use size_t strings/strto.c: unsigned char -> uchar strings/strtod.c: Changed functions to use size_t strings/strxnmov.c: Changed functions to use size_t strings/xml.c: Changed functions to use size_t Indentation fixes tests/mysql_client_test.c: Removed some old types tests/thread_test.c: Removed some old types vio/test-ssl.c: Removed some old types vio/test-sslclient.c: Removed some old types vio/test-sslserver.c: Removed some old types vio/vio.c: Removed some old types vio/vio_priv.h: Removed some old types Changed vio_read()/vio_write() to work with size_t vio/viosocket.c: Changed vio_read()/vio_write() to work with size_t Indentation fixes vio/viossl.c: Changed vio_read()/vio_write() to work with size_t Indentation fixes vio/viosslfactories.c: Removed some old types vio/viotest-ssl.c: Removed some old types win/README: More explanations
516 lines
19 KiB
C
516 lines
19 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* This file includes constants used with all databases */
|
|
/* Author: Michael Widenius */
|
|
|
|
#ifndef _my_base_h
|
|
#define _my_base_h
|
|
|
|
#ifndef stdin /* Included first in handler */
|
|
#define CHSIZE_USED
|
|
#include <my_global.h>
|
|
#include <my_dir.h> /* This includes types */
|
|
#include <my_sys.h>
|
|
#include <m_string.h>
|
|
#include <errno.h>
|
|
|
|
#ifndef EOVERFLOW
|
|
#define EOVERFLOW 84
|
|
#endif
|
|
|
|
#if !defined(USE_MY_FUNC) && !defined(THREAD)
|
|
#include <my_nosys.h> /* For faster code, after test */
|
|
#endif /* USE_MY_FUNC */
|
|
#endif /* stdin */
|
|
#include <my_list.h>
|
|
|
|
/* The following is bits in the flag parameter to ha_open() */
|
|
|
|
#define HA_OPEN_ABORT_IF_LOCKED 0 /* default */
|
|
#define HA_OPEN_WAIT_IF_LOCKED 1
|
|
#define HA_OPEN_IGNORE_IF_LOCKED 2
|
|
#define HA_OPEN_TMP_TABLE 4 /* Table is a temp table */
|
|
#define HA_OPEN_DELAY_KEY_WRITE 8 /* Don't update index */
|
|
#define HA_OPEN_ABORT_IF_CRASHED 16
|
|
#define HA_OPEN_FOR_REPAIR 32 /* open even if crashed */
|
|
#define HA_OPEN_FROM_SQL_LAYER 64
|
|
#define HA_OPEN_MMAP 128 /* open memory mapped */
|
|
|
|
/* The following is parameter to ha_rkey() how to use key */
|
|
|
|
/*
|
|
We define a complete-field prefix of a key value as a prefix where
|
|
the last included field in the prefix contains the full field, not
|
|
just some bytes from the start of the field. A partial-field prefix
|
|
is allowed to contain only a few first bytes from the last included
|
|
field.
|
|
|
|
Below HA_READ_KEY_EXACT, ..., HA_READ_BEFORE_KEY can take a
|
|
complete-field prefix of a key value as the search
|
|
key. HA_READ_PREFIX and HA_READ_PREFIX_LAST could also take a
|
|
partial-field prefix, but currently (4.0.10) they are only used with
|
|
complete-field prefixes. MySQL uses a padding trick to implement
|
|
LIKE 'abc%' queries.
|
|
|
|
NOTE that in InnoDB HA_READ_PREFIX_LAST will NOT work with a
|
|
partial-field prefix because InnoDB currently strips spaces from the
|
|
end of varchar fields!
|
|
*/
|
|
|
|
enum ha_rkey_function {
|
|
HA_READ_KEY_EXACT, /* Find first record else error */
|
|
HA_READ_KEY_OR_NEXT, /* Record or next record */
|
|
HA_READ_KEY_OR_PREV, /* Record or previous */
|
|
HA_READ_AFTER_KEY, /* Find next rec. after key-record */
|
|
HA_READ_BEFORE_KEY, /* Find next rec. before key-record */
|
|
HA_READ_PREFIX, /* Key which as same prefix */
|
|
HA_READ_PREFIX_LAST, /* Last key with the same prefix */
|
|
HA_READ_PREFIX_LAST_OR_PREV, /* Last or prev key with the same prefix */
|
|
HA_READ_MBR_CONTAIN,
|
|
HA_READ_MBR_INTERSECT,
|
|
HA_READ_MBR_WITHIN,
|
|
HA_READ_MBR_DISJOINT,
|
|
HA_READ_MBR_EQUAL
|
|
};
|
|
|
|
/* Key algorithm types */
|
|
|
|
enum ha_key_alg {
|
|
HA_KEY_ALG_UNDEF= 0, /* Not specified (old file) */
|
|
HA_KEY_ALG_BTREE= 1, /* B-tree, default one */
|
|
HA_KEY_ALG_RTREE= 2, /* R-tree, for spatial searches */
|
|
HA_KEY_ALG_HASH= 3, /* HASH keys (HEAP tables) */
|
|
HA_KEY_ALG_FULLTEXT= 4 /* FULLTEXT (MyISAM tables) */
|
|
};
|
|
|
|
/* Storage media types */
|
|
|
|
enum ha_storage_media {
|
|
HA_SM_DEFAULT= 0, /* Not specified (engine default) */
|
|
HA_SM_DISK= 1, /* DISK storage */
|
|
HA_SM_MEMORY= 2 /* MAIN MEMORY storage */
|
|
};
|
|
|
|
/* The following is parameter to ha_extra() */
|
|
|
|
enum ha_extra_function {
|
|
HA_EXTRA_NORMAL=0, /* Optimize for space (def) */
|
|
HA_EXTRA_QUICK=1, /* Optimize for speed */
|
|
HA_EXTRA_NOT_USED=2,
|
|
HA_EXTRA_CACHE=3, /* Cache record in HA_rrnd() */
|
|
HA_EXTRA_NO_CACHE=4, /* End caching of records (def) */
|
|
HA_EXTRA_NO_READCHECK=5, /* No readcheck on update */
|
|
HA_EXTRA_READCHECK=6, /* Use readcheck (def) */
|
|
HA_EXTRA_KEYREAD=7, /* Read only key to database */
|
|
HA_EXTRA_NO_KEYREAD=8, /* Normal read of records (def) */
|
|
HA_EXTRA_NO_USER_CHANGE=9, /* No user is allowed to write */
|
|
HA_EXTRA_KEY_CACHE=10,
|
|
HA_EXTRA_NO_KEY_CACHE=11,
|
|
HA_EXTRA_WAIT_LOCK=12, /* Wait until file is avalably (def) */
|
|
HA_EXTRA_NO_WAIT_LOCK=13, /* If file is locked, return quickly */
|
|
HA_EXTRA_WRITE_CACHE=14, /* Use write cache in ha_write() */
|
|
HA_EXTRA_FLUSH_CACHE=15, /* flush write_record_cache */
|
|
HA_EXTRA_NO_KEYS=16, /* Remove all update of keys */
|
|
HA_EXTRA_KEYREAD_CHANGE_POS=17, /* Keyread, but change pos */
|
|
/* xxxxchk -r must be used */
|
|
HA_EXTRA_REMEMBER_POS=18, /* Remember pos for next/prev */
|
|
HA_EXTRA_RESTORE_POS=19,
|
|
HA_EXTRA_REINIT_CACHE=20, /* init cache from current record */
|
|
HA_EXTRA_FORCE_REOPEN=21, /* Datafile have changed on disk */
|
|
HA_EXTRA_FLUSH, /* Flush tables to disk */
|
|
HA_EXTRA_NO_ROWS, /* Don't write rows */
|
|
HA_EXTRA_RESET_STATE, /* Reset positions */
|
|
HA_EXTRA_IGNORE_DUP_KEY, /* Dup keys don't rollback everything*/
|
|
HA_EXTRA_NO_IGNORE_DUP_KEY,
|
|
HA_EXTRA_PREPARE_FOR_DELETE,
|
|
HA_EXTRA_PREPARE_FOR_UPDATE, /* Remove read cache if problems */
|
|
HA_EXTRA_PRELOAD_BUFFER_SIZE, /* Set buffer size for preloading */
|
|
/*
|
|
On-the-fly switching between unique and non-unique key inserting.
|
|
*/
|
|
HA_EXTRA_CHANGE_KEY_TO_UNIQUE,
|
|
HA_EXTRA_CHANGE_KEY_TO_DUP,
|
|
/*
|
|
When using HA_EXTRA_KEYREAD, overwrite only key member fields and keep
|
|
other fields intact. When this is off (by default) InnoDB will use memcpy
|
|
to overwrite entire row.
|
|
*/
|
|
HA_EXTRA_KEYREAD_PRESERVE_FIELDS,
|
|
HA_EXTRA_MMAP,
|
|
/*
|
|
Ignore if the a tuple is not found, continue processing the
|
|
transaction and ignore that 'row'. Needed for idempotency
|
|
handling on the slave
|
|
|
|
Currently only used by NDB storage engine. Partition handler ignores flag.
|
|
*/
|
|
HA_EXTRA_IGNORE_NO_KEY,
|
|
HA_EXTRA_NO_IGNORE_NO_KEY,
|
|
/*
|
|
Mark the table as a log table. For some handlers (e.g. CSV) this results
|
|
in a special locking for the table.
|
|
*/
|
|
HA_EXTRA_MARK_AS_LOG_TABLE,
|
|
/*
|
|
Informs handler that write_row() which tries to insert new row into the
|
|
table and encounters some already existing row with same primary/unique
|
|
key can replace old row with new row instead of reporting error (basically
|
|
it informs handler that we do REPLACE instead of simple INSERT).
|
|
Off by default.
|
|
*/
|
|
HA_EXTRA_WRITE_CAN_REPLACE,
|
|
HA_EXTRA_WRITE_CANNOT_REPLACE,
|
|
/*
|
|
Inform handler that delete_row()/update_row() cannot batch deletes/updates
|
|
and should perform them immediately. This may be needed when table has
|
|
AFTER DELETE/UPDATE triggers which access to subject table.
|
|
These flags are reset by the handler::extra(HA_EXTRA_RESET) call.
|
|
*/
|
|
HA_EXTRA_DELETE_CANNOT_BATCH,
|
|
HA_EXTRA_UPDATE_CANNOT_BATCH
|
|
};
|
|
|
|
/* The following is parameter to ha_panic() */
|
|
|
|
enum ha_panic_function {
|
|
HA_PANIC_CLOSE, /* Close all databases */
|
|
HA_PANIC_WRITE, /* Unlock and write status */
|
|
HA_PANIC_READ /* Lock and read keyinfo */
|
|
};
|
|
|
|
/* The following is parameter to ha_create(); keytypes */
|
|
|
|
enum ha_base_keytype {
|
|
HA_KEYTYPE_END=0,
|
|
HA_KEYTYPE_TEXT=1, /* Key is sorted as letters */
|
|
HA_KEYTYPE_BINARY=2, /* Key is sorted as unsigned chars */
|
|
HA_KEYTYPE_SHORT_INT=3,
|
|
HA_KEYTYPE_LONG_INT=4,
|
|
HA_KEYTYPE_FLOAT=5,
|
|
HA_KEYTYPE_DOUBLE=6,
|
|
HA_KEYTYPE_NUM=7, /* Not packed num with pre-space */
|
|
HA_KEYTYPE_USHORT_INT=8,
|
|
HA_KEYTYPE_ULONG_INT=9,
|
|
HA_KEYTYPE_LONGLONG=10,
|
|
HA_KEYTYPE_ULONGLONG=11,
|
|
HA_KEYTYPE_INT24=12,
|
|
HA_KEYTYPE_UINT24=13,
|
|
HA_KEYTYPE_INT8=14,
|
|
/* Varchar (0-255 bytes) with length packed with 1 byte */
|
|
HA_KEYTYPE_VARTEXT1=15, /* Key is sorted as letters */
|
|
HA_KEYTYPE_VARBINARY1=16, /* Key is sorted as unsigned chars */
|
|
/* Varchar (0-65535 bytes) with length packed with 2 bytes */
|
|
HA_KEYTYPE_VARTEXT2=17, /* Key is sorted as letters */
|
|
HA_KEYTYPE_VARBINARY2=18, /* Key is sorted as unsigned chars */
|
|
HA_KEYTYPE_BIT=19
|
|
};
|
|
|
|
#define HA_MAX_KEYTYPE 31 /* Must be log2-1 */
|
|
|
|
/* These flags kan be OR:ed to key-flag */
|
|
|
|
#define HA_NOSAME 1 /* Set if not dupplicated records */
|
|
#define HA_PACK_KEY 2 /* Pack string key to previous key */
|
|
#define HA_AUTO_KEY 16
|
|
#define HA_BINARY_PACK_KEY 32 /* Packing of all keys to prev key */
|
|
#define HA_FULLTEXT 128 /* For full-text search */
|
|
#define HA_UNIQUE_CHECK 256 /* Check the key for uniqueness */
|
|
#define HA_SPATIAL 1024 /* For spatial search */
|
|
#define HA_NULL_ARE_EQUAL 2048 /* NULL in key are cmp as equal */
|
|
#define HA_GENERATED_KEY 8192 /* Automaticly generated key */
|
|
|
|
/* The combination of the above can be used for key type comparison. */
|
|
#define HA_KEYFLAG_MASK (HA_NOSAME | HA_PACK_KEY | HA_AUTO_KEY | \
|
|
HA_BINARY_PACK_KEY | HA_FULLTEXT | HA_UNIQUE_CHECK | \
|
|
HA_SPATIAL | HA_NULL_ARE_EQUAL | HA_GENERATED_KEY)
|
|
|
|
/* Automatic bits in key-flag */
|
|
|
|
#define HA_SPACE_PACK_USED 4 /* Test for if SPACE_PACK used */
|
|
#define HA_VAR_LENGTH_KEY 8
|
|
#define HA_NULL_PART_KEY 64
|
|
#define HA_USES_PARSER 16384 /* Fulltext index uses [pre]parser */
|
|
#define HA_USES_BLOCK_SIZE ((uint) 32768)
|
|
#define HA_SORT_ALLOWS_SAME 512 /* Intern bit when sorting records */
|
|
#if MYSQL_VERSION_ID < 0x50200
|
|
/*
|
|
Key has a part that can have end space. If this is an unique key
|
|
we have to handle it differently from other unique keys as we can find
|
|
many matching rows for one key (because end space are not compared)
|
|
*/
|
|
#define HA_END_SPACE_KEY 0 /* was: 4096 */
|
|
#else
|
|
#error HA_END_SPACE_KEY is obsolete, please remove it
|
|
#endif
|
|
|
|
|
|
/* These flags can be added to key-seg-flag */
|
|
|
|
#define HA_SPACE_PACK 1 /* Pack space in key-seg */
|
|
#define HA_PART_KEY_SEG 4 /* Used by MySQL for part-key-cols */
|
|
#define HA_VAR_LENGTH_PART 8
|
|
#define HA_NULL_PART 16
|
|
#define HA_BLOB_PART 32
|
|
#define HA_SWAP_KEY 64
|
|
#define HA_REVERSE_SORT 128 /* Sort key in reverse order */
|
|
#define HA_NO_SORT 256 /* do not bother sorting on this keyseg */
|
|
/*
|
|
End space in unique/varchar are considered equal. (Like 'a' and 'a ')
|
|
Only needed for internal temporary tables.
|
|
*/
|
|
#define HA_END_SPACE_ARE_EQUAL 512
|
|
#define HA_BIT_PART 1024
|
|
|
|
/* optionbits for database */
|
|
#define HA_OPTION_PACK_RECORD 1
|
|
#define HA_OPTION_PACK_KEYS 2
|
|
#define HA_OPTION_COMPRESS_RECORD 4
|
|
#define HA_OPTION_LONG_BLOB_PTR 8 /* new ISAM format */
|
|
#define HA_OPTION_TMP_TABLE 16
|
|
#define HA_OPTION_CHECKSUM 32
|
|
#define HA_OPTION_DELAY_KEY_WRITE 64
|
|
#define HA_OPTION_NO_PACK_KEYS 128 /* Reserved for MySQL */
|
|
#define HA_OPTION_CREATE_FROM_ENGINE 256
|
|
#define HA_OPTION_RELIES_ON_SQL_LAYER 512
|
|
#define HA_OPTION_TEMP_COMPRESS_RECORD ((uint) 16384) /* set by isamchk */
|
|
#define HA_OPTION_READ_ONLY_DATA ((uint) 32768) /* Set by isamchk */
|
|
|
|
/* Bits in flag to create() */
|
|
|
|
#define HA_DONT_TOUCH_DATA 1 /* Don't empty datafile (isamchk) */
|
|
#define HA_PACK_RECORD 2 /* Request packed record format */
|
|
#define HA_CREATE_TMP_TABLE 4
|
|
#define HA_CREATE_CHECKSUM 8
|
|
#define HA_CREATE_DELAY_KEY_WRITE 64
|
|
#define HA_CREATE_RELIES_ON_SQL_LAYER 128
|
|
|
|
/*
|
|
The following flags (OR-ed) are passed to handler::info() method.
|
|
The method copies misc handler information out of the storage engine
|
|
to data structures accessible from MySQL
|
|
|
|
Same flags are also passed down to mi_status, myrg_status, etc.
|
|
*/
|
|
|
|
/* this one is not used */
|
|
#define HA_STATUS_POS 1
|
|
/*
|
|
assuming the table keeps shared actual copy of the 'info' and
|
|
local, possibly outdated copy, the following flag means that
|
|
it should not try to get the actual data (locking the shared structure)
|
|
slightly outdated version will suffice
|
|
*/
|
|
#define HA_STATUS_NO_LOCK 2
|
|
/* update the time of the last modification (in handler::update_time) */
|
|
#define HA_STATUS_TIME 4
|
|
/*
|
|
update the 'constant' part of the info:
|
|
handler::max_data_file_length, max_index_file_length, create_time
|
|
sortkey, ref_length, block_size, data_file_name, index_file_name.
|
|
handler::table->s->keys_in_use, keys_for_keyread, rec_per_key
|
|
*/
|
|
#define HA_STATUS_CONST 8
|
|
/*
|
|
update the 'variable' part of the info:
|
|
handler::records, deleted, data_file_length, index_file_length,
|
|
delete_length, check_time, mean_rec_length
|
|
*/
|
|
#define HA_STATUS_VARIABLE 16
|
|
/*
|
|
get the information about the key that caused last duplicate value error
|
|
update handler::errkey and handler::dupp_ref
|
|
see handler::get_dup_key()
|
|
*/
|
|
#define HA_STATUS_ERRKEY 32
|
|
/*
|
|
update handler::auto_increment_value
|
|
*/
|
|
#define HA_STATUS_AUTO 64
|
|
|
|
/* Errorcodes given by functions */
|
|
|
|
/* opt_sum_query() assumes these codes are > 1 */
|
|
/* Do not add error numbers before HA_ERR_FIRST. */
|
|
/* If necessary to add lower numbers, change HA_ERR_FIRST accordingly. */
|
|
#define HA_ERR_FIRST 120 /*Copy first error nr.*/
|
|
#define HA_ERR_KEY_NOT_FOUND 120 /* Didn't find key on read or update */
|
|
#define HA_ERR_FOUND_DUPP_KEY 121 /* Dupplicate key on write */
|
|
#define HA_ERR_RECORD_CHANGED 123 /* Uppdate with is recoverable */
|
|
#define HA_ERR_WRONG_INDEX 124 /* Wrong index given to function */
|
|
#define HA_ERR_CRASHED 126 /* Indexfile is crashed */
|
|
#define HA_ERR_WRONG_IN_RECORD 127 /* Record-file is crashed */
|
|
#define HA_ERR_OUT_OF_MEM 128 /* Record-file is crashed */
|
|
#define HA_ERR_NOT_A_TABLE 130 /* not a MYI file - no signature */
|
|
#define HA_ERR_WRONG_COMMAND 131 /* Command not supported */
|
|
#define HA_ERR_OLD_FILE 132 /* old databasfile */
|
|
#define HA_ERR_NO_ACTIVE_RECORD 133 /* No record read in update() */
|
|
#define HA_ERR_RECORD_DELETED 134 /* A record is not there */
|
|
#define HA_ERR_RECORD_FILE_FULL 135 /* No more room in file */
|
|
#define HA_ERR_INDEX_FILE_FULL 136 /* No more room in file */
|
|
#define HA_ERR_END_OF_FILE 137 /* end in next/prev/first/last */
|
|
#define HA_ERR_UNSUPPORTED 138 /* unsupported extension used */
|
|
#define HA_ERR_TO_BIG_ROW 139 /* Too big row */
|
|
#define HA_WRONG_CREATE_OPTION 140 /* Wrong create option */
|
|
#define HA_ERR_FOUND_DUPP_UNIQUE 141 /* Dupplicate unique on write */
|
|
#define HA_ERR_UNKNOWN_CHARSET 142 /* Can't open charset */
|
|
#define HA_ERR_WRONG_MRG_TABLE_DEF 143 /* conflicting MyISAM tables in MERGE */
|
|
#define HA_ERR_CRASHED_ON_REPAIR 144 /* Last (automatic?) repair failed */
|
|
#define HA_ERR_CRASHED_ON_USAGE 145 /* Table must be repaired */
|
|
#define HA_ERR_LOCK_WAIT_TIMEOUT 146
|
|
#define HA_ERR_LOCK_TABLE_FULL 147
|
|
#define HA_ERR_READ_ONLY_TRANSACTION 148 /* Updates not allowed */
|
|
#define HA_ERR_LOCK_DEADLOCK 149
|
|
#define HA_ERR_CANNOT_ADD_FOREIGN 150 /* Cannot add a foreign key constr. */
|
|
#define HA_ERR_NO_REFERENCED_ROW 151 /* Cannot add a child row */
|
|
#define HA_ERR_ROW_IS_REFERENCED 152 /* Cannot delete a parent row */
|
|
#define HA_ERR_NO_SAVEPOINT 153 /* No savepoint with that name */
|
|
#define HA_ERR_NON_UNIQUE_BLOCK_SIZE 154 /* Non unique key block size */
|
|
#define HA_ERR_NO_SUCH_TABLE 155 /* The table does not exist in engine */
|
|
#define HA_ERR_TABLE_EXIST 156 /* The table existed in storage engine */
|
|
#define HA_ERR_NO_CONNECTION 157 /* Could not connect to storage engine */
|
|
#define HA_ERR_NULL_IN_SPATIAL 158 /* NULLs are not supported in spatial index */
|
|
#define HA_ERR_TABLE_DEF_CHANGED 159 /* The table changed in storage engine */
|
|
#define HA_ERR_NO_PARTITION_FOUND 160 /* There's no partition in table for
|
|
given value */
|
|
#define HA_ERR_RBR_LOGGING_FAILED 161 /* Row-based binlogging of row failed */
|
|
#define HA_ERR_DROP_INDEX_FK 162 /* Index needed in foreign key constr. */
|
|
#define HA_ERR_FOREIGN_DUPLICATE_KEY 163 /* Upholding foreign key constraints
|
|
would lead to a duplicate key
|
|
error in some other table. */
|
|
#define HA_ERR_TABLE_NEEDS_UPGRADE 164 /* The table changed in storage engine */
|
|
#define HA_ERR_TABLE_READONLY 165 /* The table is not writable */
|
|
|
|
#define HA_ERR_AUTOINC_READ_FAILED 166 /* Failed to get next autoinc value */
|
|
#define HA_ERR_AUTOINC_ERANGE 167 /* Failed to set row autoinc value */
|
|
#define HA_ERR_GENERIC 168 /* Generic error */
|
|
#define HA_ERR_LAST 168 /*Copy last error nr.*/
|
|
/* Add error numbers before HA_ERR_LAST and change it accordingly. */
|
|
#define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1)
|
|
|
|
/* Other constants */
|
|
|
|
#define HA_NAMELEN 64 /* Max length of saved filename */
|
|
#define NO_SUCH_KEY (~(uint)0) /* used as a key no. */
|
|
|
|
typedef ulong key_part_map;
|
|
#define HA_WHOLE_KEY (~(key_part_map)0)
|
|
|
|
/* Intern constants in databases */
|
|
|
|
/* bits in _search */
|
|
#define SEARCH_FIND 1
|
|
#define SEARCH_NO_FIND 2
|
|
#define SEARCH_SAME 4
|
|
#define SEARCH_BIGGER 8
|
|
#define SEARCH_SMALLER 16
|
|
#define SEARCH_SAVE_BUFF 32
|
|
#define SEARCH_UPDATE 64
|
|
#define SEARCH_PREFIX 128
|
|
#define SEARCH_LAST 256
|
|
#define MBR_CONTAIN 512
|
|
#define MBR_INTERSECT 1024
|
|
#define MBR_WITHIN 2048
|
|
#define MBR_DISJOINT 4096
|
|
#define MBR_EQUAL 8192
|
|
#define MBR_DATA 16384
|
|
#define SEARCH_NULL_ARE_EQUAL 32768 /* NULL in keys are equal */
|
|
#define SEARCH_NULL_ARE_NOT_EQUAL 65536 /* NULL in keys are not equal */
|
|
|
|
/* bits in opt_flag */
|
|
#define QUICK_USED 1
|
|
#define READ_CACHE_USED 2
|
|
#define READ_CHECK_USED 4
|
|
#define KEY_READ_USED 8
|
|
#define WRITE_CACHE_USED 16
|
|
#define OPT_NO_ROWS 32
|
|
|
|
/* bits in update */
|
|
#define HA_STATE_CHANGED 1 /* Database has changed */
|
|
#define HA_STATE_AKTIV 2 /* Has a current record */
|
|
#define HA_STATE_WRITTEN 4 /* Record is written */
|
|
#define HA_STATE_DELETED 8
|
|
#define HA_STATE_NEXT_FOUND 16 /* Next found record (record before) */
|
|
#define HA_STATE_PREV_FOUND 32 /* Prev found record (record after) */
|
|
#define HA_STATE_NO_KEY 64 /* Last read didn't find record */
|
|
#define HA_STATE_KEY_CHANGED 128
|
|
#define HA_STATE_WRITE_AT_END 256 /* set in _ps_find_writepos */
|
|
#define HA_STATE_BUFF_SAVED 512 /* If current keybuff is info->buff */
|
|
#define HA_STATE_ROW_CHANGED 1024 /* To invalide ROW cache */
|
|
#define HA_STATE_EXTEND_BLOCK 2048
|
|
#define HA_STATE_RNEXT_SAME 4096 /* rnext_same occupied lastkey2 */
|
|
|
|
/* myisampack expects no more than 32 field types. */
|
|
enum en_fieldtype {
|
|
FIELD_LAST=-1,FIELD_NORMAL,FIELD_SKIP_ENDSPACE,FIELD_SKIP_PRESPACE,
|
|
FIELD_SKIP_ZERO,FIELD_BLOB,FIELD_CONSTANT,FIELD_INTERVALL,FIELD_ZERO,
|
|
FIELD_VARCHAR,FIELD_CHECK,
|
|
FIELD_enum_val_count
|
|
};
|
|
|
|
enum data_file_type {
|
|
STATIC_RECORD,DYNAMIC_RECORD,COMPRESSED_RECORD
|
|
};
|
|
|
|
/* For key ranges */
|
|
|
|
#define NO_MIN_RANGE 1
|
|
#define NO_MAX_RANGE 2
|
|
#define NEAR_MIN 4
|
|
#define NEAR_MAX 8
|
|
#define UNIQUE_RANGE 16
|
|
#define EQ_RANGE 32
|
|
#define NULL_RANGE 64
|
|
#define GEOM_FLAG 128
|
|
#define SKIP_RANGE 256
|
|
|
|
typedef struct st_key_range
|
|
{
|
|
const uchar *key;
|
|
uint length;
|
|
key_part_map keypart_map;
|
|
enum ha_rkey_function flag;
|
|
} key_range;
|
|
|
|
typedef struct st_key_multi_range
|
|
{
|
|
key_range start_key;
|
|
key_range end_key;
|
|
char *ptr; /* Free to use by caller (ptr to row etc) */
|
|
uint range_flag; /* key range flags see above */
|
|
} KEY_MULTI_RANGE;
|
|
|
|
|
|
/* For number of records */
|
|
#ifdef BIG_TABLES
|
|
#define rows2double(A) ulonglong2double(A)
|
|
typedef my_off_t ha_rows;
|
|
#else
|
|
#define rows2double(A) (double) (A)
|
|
typedef ulong ha_rows;
|
|
#endif
|
|
|
|
#define HA_POS_ERROR (~ (ha_rows) 0)
|
|
#define HA_OFFSET_ERROR (~ (my_off_t) 0)
|
|
|
|
#if SYSTEM_SIZEOF_OFF_T == 4
|
|
#define MAX_FILE_SIZE INT_MAX32
|
|
#else
|
|
#define MAX_FILE_SIZE LONGLONG_MAX
|
|
#endif
|
|
|
|
#define HA_VARCHAR_PACKLENGTH(field_length) ((field_length) < 256 ? 1 :2)
|
|
|
|
#endif /* _my_base_h */
|