mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +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
1147 lines
31 KiB
C++
1147 lines
31 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 is the net layer API for the MySQL client/server protocol,
|
|
which is a tightly coupled, proprietary protocol owned by MySQL AB.
|
|
Any re-implementations of this protocol must also be under GPL
|
|
unless one has got an license from MySQL AB stating otherwise.
|
|
*/
|
|
|
|
/*
|
|
Write and read of logical packets to/from socket
|
|
|
|
Writes are cached into net_buffer_length big packets.
|
|
Read packets are reallocated dynamicly when reading big packets.
|
|
Each logical packet has the following pre-info:
|
|
3 byte length & 1 byte package-number.
|
|
|
|
This file needs to be written in C as it's used by the libmysql client as a
|
|
C file.
|
|
*/
|
|
|
|
/*
|
|
HFTODO this must be hidden if we don't want client capabilities in
|
|
embedded library
|
|
*/
|
|
#include <my_global.h>
|
|
#include <mysql.h>
|
|
#include <mysql_embed.h>
|
|
#include <mysql_com.h>
|
|
#include <mysqld_error.h>
|
|
#include <my_sys.h>
|
|
#include <m_string.h>
|
|
#include <my_net.h>
|
|
#include <violite.h>
|
|
#include <signal.h>
|
|
#include <errno.h>
|
|
#ifdef __NETWARE__
|
|
#include <sys/select.h>
|
|
#endif
|
|
|
|
#ifdef EMBEDDED_LIBRARY
|
|
#undef MYSQL_SERVER
|
|
#undef MYSQL_CLIENT
|
|
#define MYSQL_CLIENT
|
|
#endif /*EMBEDDED_LIBRARY */
|
|
|
|
|
|
/*
|
|
The following handles the differences when this is linked between the
|
|
client and the server.
|
|
|
|
This gives an error if a too big packet is found
|
|
The server can change this with the -O switch, but because the client
|
|
can't normally do this the client should have a bigger max_allowed_packet.
|
|
*/
|
|
|
|
#if defined(__WIN__) || !defined(MYSQL_SERVER)
|
|
/* The following is because alarms doesn't work on windows. */
|
|
#define NO_ALARM
|
|
#endif
|
|
|
|
#ifndef NO_ALARM
|
|
#include "my_pthread.h"
|
|
void sql_print_error(const char *format,...);
|
|
#else
|
|
#define DONT_USE_THR_ALARM
|
|
#endif /* NO_ALARM */
|
|
|
|
#include "thr_alarm.h"
|
|
|
|
#ifdef MYSQL_SERVER
|
|
/*
|
|
The following variables/functions should really not be declared
|
|
extern, but as it's hard to include mysql_priv.h here, we have to
|
|
live with this for a while.
|
|
*/
|
|
extern uint test_flags;
|
|
extern ulong bytes_sent, bytes_received, net_big_packet_count;
|
|
extern pthread_mutex_t LOCK_bytes_sent , LOCK_bytes_received;
|
|
#ifndef MYSQL_INSTANCE_MANAGER
|
|
#ifdef HAVE_QUERY_CACHE
|
|
#define USE_QUERY_CACHE
|
|
extern void query_cache_init_query(NET *net);
|
|
extern void query_cache_insert(NET *net, const char *packet, ulong length);
|
|
#endif // HAVE_QUERY_CACHE
|
|
#define update_statistics(A) A
|
|
#endif /* MYSQL_INSTANCE_MANGER */
|
|
#endif /* defined(MYSQL_SERVER) && !defined(MYSQL_INSTANCE_MANAGER) */
|
|
|
|
#if !defined(MYSQL_SERVER) || defined(MYSQL_INSTANCE_MANAGER)
|
|
#define update_statistics(A)
|
|
#define thd_increment_bytes_sent(N)
|
|
#endif
|
|
|
|
#define TEST_BLOCKING 8
|
|
#define MAX_PACKET_LENGTH (256L*256L*256L-1)
|
|
|
|
static my_bool net_write_buff(NET *net,const uchar *packet,ulong len);
|
|
|
|
|
|
/* Init with packet info */
|
|
|
|
my_bool my_net_init(NET *net, Vio* vio)
|
|
{
|
|
DBUG_ENTER("my_net_init");
|
|
my_net_local_init(net); /* Set some limits */
|
|
if (!(net->buff=(uchar*) my_malloc((size_t) net->max_packet+
|
|
NET_HEADER_SIZE + COMP_HEADER_SIZE,
|
|
MYF(MY_WME))))
|
|
DBUG_RETURN(1);
|
|
net->buff_end=net->buff+net->max_packet;
|
|
net->vio = vio;
|
|
net->no_send_ok= net->no_send_eof= net->no_send_error= 0;
|
|
net->error=0; net->return_errno=0; net->return_status=0;
|
|
net->pkt_nr=net->compress_pkt_nr=0;
|
|
net->write_pos=net->read_pos = net->buff;
|
|
net->last_error[0]=0;
|
|
net->compress=0; net->reading_or_writing=0;
|
|
net->where_b = net->remain_in_buf=0;
|
|
net->last_errno=0;
|
|
#ifdef USE_QUERY_CACHE
|
|
query_cache_init_query(net);
|
|
#else
|
|
net->query_cache_query= 0;
|
|
#endif
|
|
net->report_error= 0;
|
|
|
|
if (vio != 0) /* If real connection */
|
|
{
|
|
net->fd = vio_fd(vio); /* For perl DBI/DBD */
|
|
#if defined(MYSQL_SERVER) && !defined(__WIN__)
|
|
if (!(test_flags & TEST_BLOCKING))
|
|
{
|
|
my_bool old_mode;
|
|
vio_blocking(vio, FALSE, &old_mode);
|
|
}
|
|
#endif
|
|
vio_fastsend(vio);
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
void net_end(NET *net)
|
|
{
|
|
DBUG_ENTER("net_end");
|
|
my_free(net->buff,MYF(MY_ALLOW_ZERO_PTR));
|
|
net->buff=0;
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/* Realloc the packet buffer */
|
|
|
|
my_bool net_realloc(NET *net, size_t length)
|
|
{
|
|
uchar *buff;
|
|
size_t pkt_length;
|
|
DBUG_ENTER("net_realloc");
|
|
DBUG_PRINT("enter",("length: %lu", (ulong) length));
|
|
|
|
if (length >= net->max_packet_size)
|
|
{
|
|
DBUG_PRINT("error", ("Packet too large. Max size: %lu",
|
|
net->max_packet_size));
|
|
net->error= 1;
|
|
net->report_error= 1;
|
|
net->last_errno= ER_NET_PACKET_TOO_LARGE;
|
|
DBUG_RETURN(1);
|
|
}
|
|
pkt_length = (length+IO_SIZE-1) & ~(IO_SIZE-1);
|
|
/*
|
|
We must allocate some extra bytes for the end 0 and to be able to
|
|
read big compressed blocks
|
|
*/
|
|
if (!(buff= (uchar*) my_realloc((char*) net->buff, pkt_length +
|
|
NET_HEADER_SIZE + COMP_HEADER_SIZE,
|
|
MYF(MY_WME))))
|
|
{
|
|
net->error= 1;
|
|
net->report_error= 1;
|
|
net->last_errno= ER_OUT_OF_RESOURCES;
|
|
DBUG_RETURN(1);
|
|
}
|
|
net->buff=net->write_pos=buff;
|
|
net->buff_end=buff+(net->max_packet= (ulong) pkt_length);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
/*
|
|
Check if there is any data to be read from the socket
|
|
|
|
SYNOPSIS
|
|
net_data_is_ready()
|
|
sd socket descriptor
|
|
|
|
DESCRIPTION
|
|
Check if there is any data to be read from the socket.
|
|
|
|
RETURN VALUES
|
|
0 No data to read
|
|
1 Data or EOF to read
|
|
-1 Don't know if data is ready or not
|
|
*/
|
|
|
|
#if !defined(EMBEDDED_LIBRARY)
|
|
|
|
static int net_data_is_ready(my_socket sd)
|
|
{
|
|
#ifdef HAVE_POLL
|
|
struct pollfd ufds;
|
|
int res;
|
|
|
|
ufds.fd= sd;
|
|
ufds.events= POLLIN | POLLPRI;
|
|
if (!(res= poll(&ufds, 1, 0)))
|
|
return 0;
|
|
if (res < 0 || !(ufds.revents & (POLLIN | POLLPRI)))
|
|
return 0;
|
|
return 1;
|
|
#else
|
|
fd_set sfds;
|
|
struct timeval tv;
|
|
int res;
|
|
|
|
#ifndef __WIN__
|
|
/* Windows uses an _array_ of 64 fd's as default, so it's safe */
|
|
if (sd >= FD_SETSIZE)
|
|
return -1;
|
|
#define NET_DATA_IS_READY_CAN_RETURN_MINUS_ONE
|
|
#endif
|
|
|
|
FD_ZERO(&sfds);
|
|
FD_SET(sd, &sfds);
|
|
|
|
tv.tv_sec= tv.tv_usec= 0;
|
|
|
|
if ((res= select(sd+1, &sfds, NULL, NULL, &tv)) < 0)
|
|
return 0;
|
|
else
|
|
return test(res ? FD_ISSET(sd, &sfds) : 0);
|
|
#endif /* HAVE_POLL */
|
|
}
|
|
|
|
#endif /* EMBEDDED_LIBRARY */
|
|
|
|
/*
|
|
Remove unwanted characters from connection
|
|
and check if disconnected
|
|
|
|
SYNOPSIS
|
|
net_clear()
|
|
net NET handler
|
|
clear_buffer If <> 0, then clear all data from communication buffer
|
|
|
|
DESCRIPTION
|
|
Read from socket until there is nothing more to read. Discard
|
|
what is read.
|
|
|
|
If there is anything when to read 'net_clear' is called this
|
|
normally indicates an error in the protocol.
|
|
|
|
When connection is properly closed (for TCP it means with
|
|
a FIN packet), then select() considers a socket "ready to read",
|
|
in the sense that there's EOF to read, but read() returns 0.
|
|
|
|
*/
|
|
|
|
void net_clear(NET *net, my_bool clear_buffer)
|
|
{
|
|
#if !defined(EMBEDDED_LIBRARY)
|
|
size_t count;
|
|
int ready;
|
|
#endif
|
|
DBUG_ENTER("net_clear");
|
|
|
|
#if !defined(EMBEDDED_LIBRARY)
|
|
if (clear_buffer)
|
|
{
|
|
while ((ready= net_data_is_ready(net->vio->sd)) > 0)
|
|
{
|
|
/* The socket is ready */
|
|
if ((long) (count= vio_read(net->vio, net->buff,
|
|
(size_t) net->max_packet)) > 0)
|
|
{
|
|
DBUG_PRINT("info",("skipped %ld bytes from file: %s",
|
|
(long) count, vio_description(net->vio)));
|
|
#if defined(EXTRA_DEBUG)
|
|
fprintf(stderr,"Note: net_clear() skipped %ld bytes from file: %s\n",
|
|
(long) count, vio_description(net->vio));
|
|
#endif
|
|
}
|
|
else
|
|
{
|
|
DBUG_PRINT("info",("socket ready but only EOF to read - disconnected"));
|
|
net->error= 2;
|
|
break;
|
|
}
|
|
}
|
|
#ifdef NET_DATA_IS_READY_CAN_RETURN_MINUS_ONE
|
|
/* 'net_data_is_ready' returned "don't know" */
|
|
if (ready == -1)
|
|
{
|
|
/* Read unblocking to clear net */
|
|
my_bool old_mode;
|
|
if (!vio_blocking(net->vio, FALSE, &old_mode))
|
|
{
|
|
while ((long) (count= vio_read(net->vio, net->buff,
|
|
(size_t) net->max_packet)) > 0)
|
|
DBUG_PRINT("info",("skipped %ld bytes from file: %s",
|
|
(long) count, vio_description(net->vio)));
|
|
vio_blocking(net->vio, TRUE, &old_mode);
|
|
}
|
|
}
|
|
#endif /* NET_DATA_IS_READY_CAN_RETURN_MINUS_ONE */
|
|
}
|
|
#endif /* EMBEDDED_LIBRARY */
|
|
net->pkt_nr=net->compress_pkt_nr=0; /* Ready for new command */
|
|
net->write_pos=net->buff;
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/* Flush write_buffer if not empty. */
|
|
|
|
my_bool net_flush(NET *net)
|
|
{
|
|
my_bool error= 0;
|
|
DBUG_ENTER("net_flush");
|
|
if (net->buff != net->write_pos)
|
|
{
|
|
error=test(net_real_write(net, net->buff,
|
|
(size_t) (net->write_pos - net->buff)));
|
|
net->write_pos=net->buff;
|
|
}
|
|
/* Sync packet number if using compression */
|
|
if (net->compress)
|
|
net->pkt_nr=net->compress_pkt_nr;
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*****************************************************************************
|
|
** Write something to server/client buffer
|
|
*****************************************************************************/
|
|
|
|
/*
|
|
Write a logical packet with packet header
|
|
Format: Packet length (3 bytes), packet number(1 byte)
|
|
When compression is used a 3 byte compression length is added
|
|
|
|
NOTE
|
|
If compression is used the original package is modified!
|
|
*/
|
|
|
|
my_bool
|
|
my_net_write(NET *net,const uchar *packet,size_t len)
|
|
{
|
|
uchar buff[NET_HEADER_SIZE];
|
|
if (unlikely(!net->vio)) /* nowhere to write */
|
|
return 0;
|
|
/*
|
|
Big packets are handled by splitting them in packets of MAX_PACKET_LENGTH
|
|
length. The last packet is always a packet that is < MAX_PACKET_LENGTH.
|
|
(The last packet may even have a length of 0)
|
|
*/
|
|
while (len >= MAX_PACKET_LENGTH)
|
|
{
|
|
const ulong z_size = MAX_PACKET_LENGTH;
|
|
int3store(buff, z_size);
|
|
buff[3]= (uchar) net->pkt_nr++;
|
|
if (net_write_buff(net, buff, NET_HEADER_SIZE) ||
|
|
net_write_buff(net, packet, z_size))
|
|
return 1;
|
|
packet += z_size;
|
|
len-= z_size;
|
|
}
|
|
/* Write last packet */
|
|
int3store(buff,len);
|
|
buff[3]= (uchar) net->pkt_nr++;
|
|
if (net_write_buff(net, buff, NET_HEADER_SIZE))
|
|
return 1;
|
|
#ifndef DEBUG_DATA_PACKETS
|
|
DBUG_DUMP("packet_header", buff, NET_HEADER_SIZE);
|
|
#endif
|
|
return test(net_write_buff(net,packet,len));
|
|
}
|
|
|
|
/*
|
|
Send a command to the server.
|
|
|
|
SYNOPSIS
|
|
net_write_command()
|
|
net NET handler
|
|
command Command in MySQL server (enum enum_server_command)
|
|
header Header to write after command
|
|
head_len Length of header
|
|
packet Query or parameter to query
|
|
len Length of packet
|
|
|
|
DESCRIPTION
|
|
The reason for having both header and packet is so that libmysql
|
|
can easy add a header to a special command (like prepared statements)
|
|
without having to re-alloc the string.
|
|
|
|
As the command is part of the first data packet, we have to do some data
|
|
juggling to put the command in there, without having to create a new
|
|
packet.
|
|
This function will split big packets into sub-packets if needed.
|
|
(Each sub packet can only be 2^24 bytes)
|
|
|
|
RETURN VALUES
|
|
0 ok
|
|
1 error
|
|
*/
|
|
|
|
my_bool
|
|
net_write_command(NET *net,uchar command,
|
|
const uchar *header, size_t head_len,
|
|
const uchar *packet, size_t len)
|
|
{
|
|
ulong length=len+1+head_len; /* 1 extra byte for command */
|
|
uchar buff[NET_HEADER_SIZE+1];
|
|
uint header_size=NET_HEADER_SIZE+1;
|
|
DBUG_ENTER("net_write_command");
|
|
DBUG_PRINT("enter",("length: %lu", len));
|
|
|
|
buff[4]=command; /* For first packet */
|
|
|
|
if (length >= MAX_PACKET_LENGTH)
|
|
{
|
|
/* Take into account that we have the command in the first header */
|
|
len= MAX_PACKET_LENGTH - 1 - head_len;
|
|
do
|
|
{
|
|
int3store(buff, MAX_PACKET_LENGTH);
|
|
buff[3]= (uchar) net->pkt_nr++;
|
|
if (net_write_buff(net, buff, header_size) ||
|
|
net_write_buff(net, header, head_len) ||
|
|
net_write_buff(net, packet, len))
|
|
DBUG_RETURN(1);
|
|
packet+= len;
|
|
length-= MAX_PACKET_LENGTH;
|
|
len= MAX_PACKET_LENGTH;
|
|
head_len= 0;
|
|
header_size= NET_HEADER_SIZE;
|
|
} while (length >= MAX_PACKET_LENGTH);
|
|
len=length; /* Data left to be written */
|
|
}
|
|
int3store(buff,length);
|
|
buff[3]= (uchar) net->pkt_nr++;
|
|
DBUG_RETURN(test(net_write_buff(net, buff, header_size) ||
|
|
(head_len && net_write_buff(net, header, head_len)) ||
|
|
net_write_buff(net, packet, len) || net_flush(net)));
|
|
}
|
|
|
|
/*
|
|
Caching the data in a local buffer before sending it.
|
|
|
|
SYNOPSIS
|
|
net_write_buff()
|
|
net Network handler
|
|
packet Packet to send
|
|
len Length of packet
|
|
|
|
DESCRIPTION
|
|
Fill up net->buffer and send it to the client when full.
|
|
|
|
If the rest of the to-be-sent-packet is bigger than buffer,
|
|
send it in one big block (to avoid copying to internal buffer).
|
|
If not, copy the rest of the data to the buffer and return without
|
|
sending data.
|
|
|
|
NOTES
|
|
The cached buffer can be sent as it is with 'net_flush()'.
|
|
|
|
In this code we have to be careful to not send a packet longer than
|
|
MAX_PACKET_LENGTH to net_real_write() if we are using the compressed
|
|
protocol as we store the length of the compressed packet in 3 bytes.
|
|
|
|
RETURN
|
|
0 ok
|
|
1
|
|
*/
|
|
|
|
static my_bool
|
|
net_write_buff(NET *net, const uchar *packet, ulong len)
|
|
{
|
|
ulong left_length;
|
|
if (net->compress && net->max_packet > MAX_PACKET_LENGTH)
|
|
left_length= MAX_PACKET_LENGTH - (net->write_pos - net->buff);
|
|
else
|
|
left_length= (ulong) (net->buff_end - net->write_pos);
|
|
|
|
#ifdef DEBUG_DATA_PACKETS
|
|
DBUG_DUMP("data", packet, len);
|
|
#endif
|
|
if (len > left_length)
|
|
{
|
|
if (net->write_pos != net->buff)
|
|
{
|
|
/* Fill up already used packet and write it */
|
|
memcpy((char*) net->write_pos,packet,left_length);
|
|
if (net_real_write(net, net->buff,
|
|
(size_t) (net->write_pos - net->buff) + left_length))
|
|
return 1;
|
|
net->write_pos= net->buff;
|
|
packet+= left_length;
|
|
len-= left_length;
|
|
}
|
|
if (net->compress)
|
|
{
|
|
/*
|
|
We can't have bigger packets than 16M with compression
|
|
Because the uncompressed length is stored in 3 bytes
|
|
*/
|
|
left_length= MAX_PACKET_LENGTH;
|
|
while (len > left_length)
|
|
{
|
|
if (net_real_write(net, packet, left_length))
|
|
return 1;
|
|
packet+= left_length;
|
|
len-= left_length;
|
|
}
|
|
}
|
|
if (len > net->max_packet)
|
|
return net_real_write(net, packet, len) ? 1 : 0;
|
|
/* Send out rest of the blocks as full sized blocks */
|
|
}
|
|
memcpy((char*) net->write_pos,packet,len);
|
|
net->write_pos+= len;
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Read and write one packet using timeouts.
|
|
If needed, the packet is compressed before sending.
|
|
*/
|
|
|
|
int
|
|
net_real_write(NET *net,const uchar *packet, size_t len)
|
|
{
|
|
size_t length;
|
|
const uchar *pos,*end;
|
|
thr_alarm_t alarmed;
|
|
#ifndef NO_ALARM
|
|
ALARM alarm_buff;
|
|
#endif
|
|
uint retry_count=0;
|
|
my_bool net_blocking = vio_is_blocking(net->vio);
|
|
DBUG_ENTER("net_real_write");
|
|
|
|
#if defined(MYSQL_SERVER) && defined(USE_QUERY_CACHE)
|
|
query_cache_insert(net, (char*) packet, len);
|
|
#endif
|
|
|
|
if (net->error == 2)
|
|
DBUG_RETURN(-1); /* socket can't be used */
|
|
|
|
net->reading_or_writing=2;
|
|
#ifdef HAVE_COMPRESS
|
|
if (net->compress)
|
|
{
|
|
size_t complen;
|
|
uchar *b;
|
|
uint header_length=NET_HEADER_SIZE+COMP_HEADER_SIZE;
|
|
if (!(b= (uchar*) my_malloc(len + NET_HEADER_SIZE +
|
|
COMP_HEADER_SIZE, MYF(MY_WME))))
|
|
{
|
|
#ifdef MYSQL_SERVER
|
|
net->last_errno= ER_OUT_OF_RESOURCES;
|
|
net->error= 2;
|
|
/* TODO is it needed to set this variable if we have no socket */
|
|
net->report_error= 1;
|
|
#endif
|
|
net->reading_or_writing= 0;
|
|
DBUG_RETURN(1);
|
|
}
|
|
memcpy(b+header_length,packet,len);
|
|
|
|
if (my_compress(b+header_length, &len, &complen))
|
|
complen=0;
|
|
int3store(&b[NET_HEADER_SIZE],complen);
|
|
int3store(b,len);
|
|
b[3]=(uchar) (net->compress_pkt_nr++);
|
|
len+= header_length;
|
|
packet= b;
|
|
}
|
|
#endif /* HAVE_COMPRESS */
|
|
|
|
#ifdef DEBUG_DATA_PACKETS
|
|
DBUG_DUMP("data", packet, len);
|
|
#endif
|
|
|
|
#ifndef NO_ALARM
|
|
thr_alarm_init(&alarmed);
|
|
if (net_blocking)
|
|
thr_alarm(&alarmed,(uint) net->write_timeout,&alarm_buff);
|
|
#else
|
|
alarmed=0;
|
|
/* Write timeout is set in net_set_write_timeout */
|
|
#endif /* NO_ALARM */
|
|
|
|
pos= packet;
|
|
end=pos+len;
|
|
while (pos != end)
|
|
{
|
|
if ((long) (length= vio_write(net->vio,pos,(size_t) (end-pos))) <= 0)
|
|
{
|
|
my_bool interrupted = vio_should_retry(net->vio);
|
|
#if !defined(__WIN__)
|
|
if ((interrupted || length == 0) && !thr_alarm_in_use(&alarmed))
|
|
{
|
|
if (!thr_alarm(&alarmed,(uint) net->write_timeout,&alarm_buff))
|
|
{ /* Always true for client */
|
|
my_bool old_mode;
|
|
while (vio_blocking(net->vio, TRUE, &old_mode) < 0)
|
|
{
|
|
if (vio_should_retry(net->vio) && retry_count++ < net->retry_count)
|
|
continue;
|
|
#ifdef EXTRA_DEBUG
|
|
fprintf(stderr,
|
|
"%s: my_net_write: fcntl returned error %d, aborting thread\n",
|
|
my_progname,vio_errno(net->vio));
|
|
#endif /* EXTRA_DEBUG */
|
|
#ifdef MYSQL_SERVER
|
|
net->last_errno= ER_NET_ERROR_ON_WRITE;
|
|
#endif
|
|
net->error= 2; /* Close socket */
|
|
net->report_error= 1;
|
|
goto end;
|
|
}
|
|
retry_count=0;
|
|
continue;
|
|
}
|
|
}
|
|
else
|
|
#endif /* !defined(__WIN__) */
|
|
if (thr_alarm_in_use(&alarmed) && !thr_got_alarm(&alarmed) &&
|
|
interrupted)
|
|
{
|
|
if (retry_count++ < net->retry_count)
|
|
continue;
|
|
#ifdef EXTRA_DEBUG
|
|
fprintf(stderr, "%s: write looped, aborting thread\n",
|
|
my_progname);
|
|
#endif /* EXTRA_DEBUG */
|
|
}
|
|
#if defined(THREAD_SAFE_CLIENT) && !defined(MYSQL_SERVER)
|
|
if (vio_errno(net->vio) == SOCKET_EINTR)
|
|
{
|
|
DBUG_PRINT("warning",("Interrupted write. Retrying..."));
|
|
continue;
|
|
}
|
|
#endif /* defined(THREAD_SAFE_CLIENT) && !defined(MYSQL_SERVER) */
|
|
net->error= 2; /* Close socket */
|
|
net->report_error= 1;
|
|
#ifdef MYSQL_SERVER
|
|
net->last_errno= (interrupted ? ER_NET_WRITE_INTERRUPTED :
|
|
ER_NET_ERROR_ON_WRITE);
|
|
#endif /* MYSQL_SERVER */
|
|
break;
|
|
}
|
|
pos+=length;
|
|
update_statistics(thd_increment_bytes_sent(length));
|
|
}
|
|
#ifndef __WIN__
|
|
end:
|
|
#endif
|
|
#ifdef HAVE_COMPRESS
|
|
if (net->compress)
|
|
my_free((char*) packet,MYF(0));
|
|
#endif
|
|
if (thr_alarm_in_use(&alarmed))
|
|
{
|
|
my_bool old_mode;
|
|
thr_end_alarm(&alarmed);
|
|
vio_blocking(net->vio, net_blocking, &old_mode);
|
|
}
|
|
net->reading_or_writing=0;
|
|
DBUG_RETURN(((int) (pos != end)));
|
|
}
|
|
|
|
|
|
/*****************************************************************************
|
|
** Read something from server/clinet
|
|
*****************************************************************************/
|
|
|
|
#ifndef NO_ALARM
|
|
|
|
static my_bool net_safe_read(NET *net, uchar *buff, size_t length,
|
|
thr_alarm_t *alarmed)
|
|
{
|
|
uint retry_count=0;
|
|
while (length > 0)
|
|
{
|
|
size_t tmp;
|
|
if ((long) (tmp= vio_read(net->vio, buff, length)) <= 0)
|
|
{
|
|
my_bool interrupted = vio_should_retry(net->vio);
|
|
if (!thr_got_alarm(alarmed) && interrupted)
|
|
{ /* Probably in MIT threads */
|
|
if (retry_count++ < net->retry_count)
|
|
continue;
|
|
}
|
|
return 1;
|
|
}
|
|
length-= tmp;
|
|
buff+= tmp;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
Help function to clear the commuication buffer when we get a too big packet.
|
|
|
|
SYNOPSIS
|
|
my_net_skip_rest()
|
|
net Communication handle
|
|
remain Bytes to read
|
|
alarmed Parameter for thr_alarm()
|
|
alarm_buff Parameter for thr_alarm()
|
|
|
|
RETURN VALUES
|
|
0 Was able to read the whole packet
|
|
1 Got mailformed packet from client
|
|
*/
|
|
|
|
static my_bool my_net_skip_rest(NET *net, uint32 remain, thr_alarm_t *alarmed,
|
|
ALARM *alarm_buff)
|
|
{
|
|
uint32 old=remain;
|
|
DBUG_ENTER("my_net_skip_rest");
|
|
DBUG_PRINT("enter",("bytes_to_skip: %u", (uint) remain));
|
|
|
|
/* The following is good for debugging */
|
|
update_statistics(thd_increment_net_big_packet_count(1));
|
|
|
|
if (!thr_alarm_in_use(alarmed))
|
|
{
|
|
my_bool old_mode;
|
|
if (thr_alarm(alarmed,net->read_timeout, alarm_buff) ||
|
|
vio_blocking(net->vio, TRUE, &old_mode) < 0)
|
|
DBUG_RETURN(1); /* Can't setup, abort */
|
|
}
|
|
for (;;)
|
|
{
|
|
while (remain > 0)
|
|
{
|
|
size_t length= min(remain, net->max_packet);
|
|
if (net_safe_read(net, net->buff, length, alarmed))
|
|
DBUG_RETURN(1);
|
|
update_statistics(thd_increment_bytes_received(length));
|
|
remain -= (uint32) length;
|
|
}
|
|
if (old != MAX_PACKET_LENGTH)
|
|
break;
|
|
if (net_safe_read(net, net->buff, NET_HEADER_SIZE, alarmed))
|
|
DBUG_RETURN(1);
|
|
old=remain= uint3korr(net->buff);
|
|
net->pkt_nr++;
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
#endif /* NO_ALARM */
|
|
|
|
|
|
/*
|
|
Reads one packet to net->buff + net->where_b
|
|
Returns length of packet. Long packets are handled by my_net_read().
|
|
This function reallocates the net->buff buffer if necessary.
|
|
*/
|
|
|
|
static ulong
|
|
my_real_read(NET *net, size_t *complen)
|
|
{
|
|
uchar *pos;
|
|
size_t length;
|
|
uint i,retry_count=0;
|
|
ulong len=packet_error;
|
|
thr_alarm_t alarmed;
|
|
#ifndef NO_ALARM
|
|
ALARM alarm_buff;
|
|
#endif
|
|
my_bool net_blocking=vio_is_blocking(net->vio);
|
|
uint32 remain= (net->compress ? NET_HEADER_SIZE+COMP_HEADER_SIZE :
|
|
NET_HEADER_SIZE);
|
|
*complen = 0;
|
|
|
|
net->reading_or_writing=1;
|
|
thr_alarm_init(&alarmed);
|
|
#ifndef NO_ALARM
|
|
if (net_blocking)
|
|
thr_alarm(&alarmed,net->read_timeout,&alarm_buff);
|
|
#else
|
|
/* Read timeout is set in net_set_read_timeout */
|
|
#endif /* NO_ALARM */
|
|
|
|
pos = net->buff + net->where_b; /* net->packet -4 */
|
|
for (i=0 ; i < 2 ; i++)
|
|
{
|
|
while (remain > 0)
|
|
{
|
|
/* First read is done with non blocking mode */
|
|
if ((long) (length= vio_read(net->vio, pos, remain)) <= 0L)
|
|
{
|
|
my_bool interrupted = vio_should_retry(net->vio);
|
|
|
|
DBUG_PRINT("info",("vio_read returned %ld errno: %d",
|
|
(long) length, vio_errno(net->vio)));
|
|
#if !defined(__WIN__) || defined(MYSQL_SERVER)
|
|
/*
|
|
We got an error that there was no data on the socket. We now set up
|
|
an alarm to not 'read forever', change the socket to non blocking
|
|
mode and try again
|
|
*/
|
|
if ((interrupted || length == 0) && !thr_alarm_in_use(&alarmed))
|
|
{
|
|
if (!thr_alarm(&alarmed,net->read_timeout,&alarm_buff)) /* Don't wait too long */
|
|
{
|
|
my_bool old_mode;
|
|
while (vio_blocking(net->vio, TRUE, &old_mode) < 0)
|
|
{
|
|
if (vio_should_retry(net->vio) &&
|
|
retry_count++ < net->retry_count)
|
|
continue;
|
|
DBUG_PRINT("error",
|
|
("fcntl returned error %d, aborting thread",
|
|
vio_errno(net->vio)));
|
|
#ifdef EXTRA_DEBUG
|
|
fprintf(stderr,
|
|
"%s: read: fcntl returned error %d, aborting thread\n",
|
|
my_progname,vio_errno(net->vio));
|
|
#endif /* EXTRA_DEBUG */
|
|
len= packet_error;
|
|
net->error= 2; /* Close socket */
|
|
net->report_error= 1;
|
|
#ifdef MYSQL_SERVER
|
|
net->last_errno= ER_NET_FCNTL_ERROR;
|
|
#endif
|
|
goto end;
|
|
}
|
|
retry_count=0;
|
|
continue;
|
|
}
|
|
}
|
|
#endif /* (!defined(__WIN__) || defined(MYSQL_SERVER) */
|
|
if (thr_alarm_in_use(&alarmed) && !thr_got_alarm(&alarmed) &&
|
|
interrupted)
|
|
{ /* Probably in MIT threads */
|
|
if (retry_count++ < net->retry_count)
|
|
continue;
|
|
#ifdef EXTRA_DEBUG
|
|
fprintf(stderr, "%s: read looped with error %d, aborting thread\n",
|
|
my_progname,vio_errno(net->vio));
|
|
#endif /* EXTRA_DEBUG */
|
|
}
|
|
#if defined(THREAD_SAFE_CLIENT) && !defined(MYSQL_SERVER)
|
|
if (vio_errno(net->vio) == SOCKET_EINTR)
|
|
{
|
|
DBUG_PRINT("warning",("Interrupted read. Retrying..."));
|
|
continue;
|
|
}
|
|
#endif
|
|
DBUG_PRINT("error",("Couldn't read packet: remain: %u errno: %d length: %ld",
|
|
remain, vio_errno(net->vio), (long) length));
|
|
len= packet_error;
|
|
net->error= 2; /* Close socket */
|
|
net->report_error= 1;
|
|
#ifdef MYSQL_SERVER
|
|
net->last_errno= (vio_was_interrupted(net->vio) ? ER_NET_READ_INTERRUPTED :
|
|
ER_NET_READ_ERROR);
|
|
#endif
|
|
goto end;
|
|
}
|
|
remain -= (uint32) length;
|
|
pos+= length;
|
|
update_statistics(thd_increment_bytes_received(length));
|
|
}
|
|
if (i == 0)
|
|
{ /* First parts is packet length */
|
|
ulong helping;
|
|
DBUG_DUMP("packet_header", net->buff+net->where_b,
|
|
NET_HEADER_SIZE);
|
|
if (net->buff[net->where_b + 3] != (uchar) net->pkt_nr)
|
|
{
|
|
if (net->buff[net->where_b] != (uchar) 255)
|
|
{
|
|
DBUG_PRINT("error",
|
|
("Packets out of order (Found: %d, expected %u)",
|
|
(int) net->buff[net->where_b + 3],
|
|
net->pkt_nr));
|
|
#ifdef EXTRA_DEBUG
|
|
fflush(stdout);
|
|
fprintf(stderr,"Error: Packets out of order (Found: %d, expected %d)\n",
|
|
(int) net->buff[net->where_b + 3],
|
|
(uint) (uchar) net->pkt_nr);
|
|
fflush(stderr);
|
|
DBUG_ASSERT(0);
|
|
#endif
|
|
}
|
|
len= packet_error;
|
|
net->report_error= 1;
|
|
#ifdef MYSQL_SERVER
|
|
net->last_errno=ER_NET_PACKETS_OUT_OF_ORDER;
|
|
#endif
|
|
goto end;
|
|
}
|
|
net->compress_pkt_nr= ++net->pkt_nr;
|
|
#ifdef HAVE_COMPRESS
|
|
if (net->compress)
|
|
{
|
|
/*
|
|
If the packet is compressed then complen > 0 and contains the
|
|
number of bytes in the uncompressed packet
|
|
*/
|
|
*complen=uint3korr(&(net->buff[net->where_b + NET_HEADER_SIZE]));
|
|
}
|
|
#endif
|
|
|
|
len=uint3korr(net->buff+net->where_b);
|
|
if (!len) /* End of big multi-packet */
|
|
goto end;
|
|
helping = max(len,*complen) + net->where_b;
|
|
/* The necessary size of net->buff */
|
|
if (helping >= net->max_packet)
|
|
{
|
|
if (net_realloc(net,helping))
|
|
{
|
|
#if defined(MYSQL_SERVER) && !defined(NO_ALARM)
|
|
if (!net->compress &&
|
|
!my_net_skip_rest(net, (uint32) len, &alarmed, &alarm_buff))
|
|
net->error= 3; /* Successfully skiped packet */
|
|
#endif
|
|
len= packet_error; /* Return error and close connection */
|
|
goto end;
|
|
}
|
|
}
|
|
pos=net->buff + net->where_b;
|
|
remain = (uint32) len;
|
|
}
|
|
}
|
|
|
|
end:
|
|
if (thr_alarm_in_use(&alarmed))
|
|
{
|
|
my_bool old_mode;
|
|
thr_end_alarm(&alarmed);
|
|
vio_blocking(net->vio, net_blocking, &old_mode);
|
|
}
|
|
net->reading_or_writing=0;
|
|
#ifdef DEBUG_DATA_PACKETS
|
|
if (len != packet_error)
|
|
DBUG_DUMP("data", net->buff+net->where_b, len);
|
|
#endif
|
|
return(len);
|
|
}
|
|
|
|
|
|
/*
|
|
Read a packet from the client/server and return it without the internal
|
|
package header.
|
|
If the packet is the first packet of a multi-packet packet
|
|
(which is indicated by the length of the packet = 0xffffff) then
|
|
all sub packets are read and concatenated.
|
|
If the packet was compressed, its uncompressed and the length of the
|
|
uncompressed packet is returned.
|
|
|
|
The function returns the length of the found packet or packet_error.
|
|
net->read_pos points to the read data.
|
|
*/
|
|
|
|
ulong
|
|
my_net_read(NET *net)
|
|
{
|
|
size_t len, complen;
|
|
|
|
#ifdef HAVE_COMPRESS
|
|
if (!net->compress)
|
|
{
|
|
#endif
|
|
len = my_real_read(net,&complen);
|
|
if (len == MAX_PACKET_LENGTH)
|
|
{
|
|
/* First packet of a multi-packet. Concatenate the packets */
|
|
ulong save_pos = net->where_b;
|
|
size_t total_length= 0;
|
|
do
|
|
{
|
|
net->where_b += len;
|
|
total_length += len;
|
|
len = my_real_read(net,&complen);
|
|
} while (len == MAX_PACKET_LENGTH);
|
|
if (len != packet_error)
|
|
len+= total_length;
|
|
net->where_b = save_pos;
|
|
}
|
|
net->read_pos = net->buff + net->where_b;
|
|
if (len != packet_error)
|
|
net->read_pos[len]=0; /* Safeguard for mysql_use_result */
|
|
return len;
|
|
#ifdef HAVE_COMPRESS
|
|
}
|
|
else
|
|
{
|
|
/* We are using the compressed protocol */
|
|
|
|
ulong buf_length;
|
|
ulong start_of_packet;
|
|
ulong first_packet_offset;
|
|
uint read_length, multi_byte_packet=0;
|
|
|
|
if (net->remain_in_buf)
|
|
{
|
|
buf_length= net->buf_length; /* Data left in old packet */
|
|
first_packet_offset= start_of_packet= (net->buf_length -
|
|
net->remain_in_buf);
|
|
/* Restore the character that was overwritten by the end 0 */
|
|
net->buff[start_of_packet]= net->save_char;
|
|
}
|
|
else
|
|
{
|
|
/* reuse buffer, as there is nothing in it that we need */
|
|
buf_length= start_of_packet= first_packet_offset= 0;
|
|
}
|
|
for (;;)
|
|
{
|
|
ulong packet_len;
|
|
|
|
if (buf_length - start_of_packet >= NET_HEADER_SIZE)
|
|
{
|
|
read_length = uint3korr(net->buff+start_of_packet);
|
|
if (!read_length)
|
|
{
|
|
/* End of multi-byte packet */
|
|
start_of_packet += NET_HEADER_SIZE;
|
|
break;
|
|
}
|
|
if (read_length + NET_HEADER_SIZE <= buf_length - start_of_packet)
|
|
{
|
|
if (multi_byte_packet)
|
|
{
|
|
/* Remove packet header for second packet */
|
|
memmove(net->buff + first_packet_offset + start_of_packet,
|
|
net->buff + first_packet_offset + start_of_packet +
|
|
NET_HEADER_SIZE,
|
|
buf_length - start_of_packet);
|
|
start_of_packet += read_length;
|
|
buf_length -= NET_HEADER_SIZE;
|
|
}
|
|
else
|
|
start_of_packet+= read_length + NET_HEADER_SIZE;
|
|
|
|
if (read_length != MAX_PACKET_LENGTH) /* last package */
|
|
{
|
|
multi_byte_packet= 0; /* No last zero len packet */
|
|
break;
|
|
}
|
|
multi_byte_packet= NET_HEADER_SIZE;
|
|
/* Move data down to read next data packet after current one */
|
|
if (first_packet_offset)
|
|
{
|
|
memmove(net->buff,net->buff+first_packet_offset,
|
|
buf_length-first_packet_offset);
|
|
buf_length-=first_packet_offset;
|
|
start_of_packet -= first_packet_offset;
|
|
first_packet_offset=0;
|
|
}
|
|
continue;
|
|
}
|
|
}
|
|
/* Move data down to read next data packet after current one */
|
|
if (first_packet_offset)
|
|
{
|
|
memmove(net->buff,net->buff+first_packet_offset,
|
|
buf_length-first_packet_offset);
|
|
buf_length-=first_packet_offset;
|
|
start_of_packet -= first_packet_offset;
|
|
first_packet_offset=0;
|
|
}
|
|
|
|
net->where_b=buf_length;
|
|
if ((packet_len = my_real_read(net,&complen)) == packet_error)
|
|
return packet_error;
|
|
if (my_uncompress(net->buff + net->where_b, packet_len,
|
|
&complen))
|
|
{
|
|
net->error= 2; /* caller will close socket */
|
|
net->report_error= 1;
|
|
#ifdef MYSQL_SERVER
|
|
net->last_errno=ER_NET_UNCOMPRESS_ERROR;
|
|
#endif
|
|
return packet_error;
|
|
}
|
|
buf_length+= complen;
|
|
}
|
|
|
|
net->read_pos= net->buff+ first_packet_offset + NET_HEADER_SIZE;
|
|
net->buf_length= buf_length;
|
|
net->remain_in_buf= (ulong) (buf_length - start_of_packet);
|
|
len = ((ulong) (start_of_packet - first_packet_offset) - NET_HEADER_SIZE -
|
|
multi_byte_packet);
|
|
net->save_char= net->read_pos[len]; /* Must be saved */
|
|
net->read_pos[len]=0; /* Safeguard for mysql_use_result */
|
|
}
|
|
#endif /* HAVE_COMPRESS */
|
|
return len;
|
|
}
|
|
|
|
|
|
void net_set_read_timeout(NET *net, uint timeout)
|
|
{
|
|
DBUG_ENTER("net_set_read_timeout");
|
|
DBUG_PRINT("enter", ("timeout: %d", timeout));
|
|
net->read_timeout= timeout;
|
|
#ifdef NO_ALARM
|
|
vio_timeout(net->vio, 0, timeout);
|
|
#endif
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
void net_set_write_timeout(NET *net, uint timeout)
|
|
{
|
|
DBUG_ENTER("net_set_write_timeout");
|
|
DBUG_PRINT("enter", ("timeout: %d", timeout));
|
|
net->write_timeout= timeout;
|
|
#ifdef NO_ALARM
|
|
vio_timeout(net->vio, 1, timeout);
|
|
#endif
|
|
DBUG_VOID_RETURN;
|
|
}
|