summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Collapse)AuthorAgeFilesLines
* Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-05-243-25/+25
|\ | | | | | | into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
| * WL#3817: Simplify string / memory area types and make things more consistent ↵monty@mysql.com/narttu.mysql.fi2007-05-103-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (first part) 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
* | Merge mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.0-ndbmikron@mikael-ronstr-ms-dator.local2007-05-072-1/+3
|\ \ | | | | | | | | | into mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.1-ndb
| * | Fix SCI Transportermikron@mikael-ronstr-ms-dator.local2007-05-072-2/+3
| | |
* | | Merge trift2.:/MySQL/M50/mysql-5.0joerg@trift2.2007-05-021-3/+3
|\ \ \ | |/ / | | / | |/ |/| into trift2.:/MySQL/M51/mysql-5.1
| * Format corrections for various "Makefile.am": Leading tab, no trailing blank.joerg@trift2.2007-05-021-3/+3
| |
* | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndbmskold/marty@linux.site2007-04-241-1/+4
|\ \ | | | | | | | | | into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
| * | ha_ndbcluster.h, ha_ndbcluster.cc:mskold/marty@mysql.com/linux.site2007-04-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Refactored code for engine_condition_pushdown to ha_ndbcluster_cond Makefile.am: Added compilation of ha_ndbcluster_cond ha_ndbcluster_cond.h, ha_ndbcluster_cond.cc: Merge
* | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1msvensson@pilot.blaudden2007-04-232-9/+11
|\ \ \ | |/ / | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| * | Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508msvensson@pilot.blaudden2007-04-112-9/+11
| |\ \ | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| | * | Bug#22508 BUILD/compile-dist fails due to problem with readline/libeditmsvensson@pilot.blaudden2007-03-272-9/+11
| | | | | | | | | | | | | | | | | | | | - Move the link_sources command from top level Makefile into each subdir that need to link files
* | | | WL#2735: Refactor replicationmats@romeo.(none)2007-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | Factoring out pack_row() and unpack_row() into new files rpl_record.{cc,h}.
* | | | BUG#27779 (Slave cannot read old rows log events):mats@romeo.(none)2007-04-121-1/+3
|/ / / | | | | | | | | | | | | | | | Taking code from before BUG#22583 and incorporating as events to be able to read old events. Also incorporating old pack and unpack functions into patch.
* | | manual mergeguilhem@gbichot3.local2007-03-091-6/+6
|\ \ \
| * | | Mechanical class renaming:guilhem@gbichot3.local2007-01-301-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protocol_simple->Protocol_text; Protocol_prep->Protocol_binary and also THD::protocol_simple->THD::protocol_text, THD::protocol_prep->THD::protocol_binary. Reason: the binary protocol is not bound to be used only with prepared statements long term (see WL#3559 "Decouple binary protocol from prepared statements"). Renaming now is pressing because the fix for BUG#735 "Prepared Statements: there is no support for Query Cache" will introduce a new member in class Query_cache_flags telling about the protocol's nature. Other reason: "simple" is less accurate than "text". Future patches for BUG#735 will rely on this cset.
* | | | Fixed compilations problems and warnings on windowsmonty@mysql.com/narttu.mysql.fi2007-02-231-1/+1
| | | |
* | | | Fixed compiler warningsmonty@mysql.com/narttu.mysql.fi2007-02-233-10/+4
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed compile-pentium64 scripts Fixed wrong estimate of update_with_key_prefix in sql-bench Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1 Fixed unsafe define of uint4korr() Fixed that --extern works with mysql-test-run.pl Small trivial cleanups This also fixes a bug in counting number of rows that are updated when we have many simultanous queries Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc Split handle_one_connection() into reusable sub functions. Split create_new_thread() into reusable sub functions. Added thread_scheduler; Preliminary interface code for future thread_handling code. Use 'my_thread_id' for internal thread id's Make thr_alarm_kill() to depend on thread_id instead of thread Make thr_abort_locks_for_thread() depend on thread_id instead of thread In store_globals(), set my_thread_var->id to be thd->thread_id. Use my_thread_var->id as basis for my_thread_name() The above changes makes the connection we have between THD and threads more soft. Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions Fixed compiler warnings Fixed core dumps when running with --debug Removed setting of signal masks (was never used) Made event code call pthread_exit() (portability fix) Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called. Made handling of thread_id and thd->variables.pseudo_thread_id uniform. Removed one common 'not freed memory' warning from mysqltest Fixed a couple of usage of not initialized warnings (unlikely cases) Suppress compiler warnings from bdb and (for the moment) warnings from ndb
* | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-02-031-0/+1
|\ \ \ | | | | | | | | | | | | into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
| * \ \ Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-271-0/+1
| |\ \ \ | | |/ / | |/| / | | |/ | | | into mysql.com:/home/my/mysql-5.1 Merge of 'remove compiler warnings when using -Wshadow'
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-221-1/+1
| | |\ | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-151-1/+1
| | | |\ | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | | | * Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-151-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed not used variables and functions - Added #ifdef around code that is not used - Renamed variables and functions to avoid conflicts - Removed some not used arguments Fixed some class/struct warnings in ndb Added define IS_LONGDATA() to simplify code in libmysql.c I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
* | | | | BUG#25890 put previous fix in better placedf@kahlann.erinye.com2007-01-271-5/+5
| | | | |
* | | | | BUG#25895 compiling the server with embedded fails on several 64-bit platformsdf@kahlann.erinye.com2007-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | temporary fix
* | | | | BUG#25890 mysqltest_embedded crashes on startdf@kahlann.erinye.com2007-01-271-0/+5
|/ / / / | | | | | | | | | | | | very temporary fix
* | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-01-171-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
| * \ \ \ Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-01-121-2/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
| | * \ \ \ Merge mysql.com:/home/bkroot/mysql-5.1-new-rpllars@black.(none)2006-12-081-2/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/bk/MERGE/mysql-5.1-merge
| | | * | | | WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.cbell/Chuck@suse.vabb.com2006-12-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Please see worklog for details on files changed.
* | | | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimemalff/marcsql@weblab.(none)2007-01-121-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | into weblab.(none):/home/marcsql/TREE/mysql-5.1-22687
| * | | | | | Bug#22687 (Functions UNIQUE_USERS, GROUP_UNIQUE_USERS)malff/marcsql@weblab.(none)2007-01-111-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to some internal communication, these two functions are place holders for future enhancements. Because they use a variable number of parameters, the implementation defined a reserved keyword for them in the parser grammar. Unfortunately, doing so creates a bug similar to Bug 21114 reported for the function FORMAT. In the 5.1 code base, due to improvements in the code implemented with bug 21114, having a reserved keyword for functions with a variable number of arguments is not needed any more by the implementation. As a result, this fix removes the place-holder implementation, and removes the unnecessary reserved keywords. Should the functions UNIQUE_USERS and GROUP_UNIQUE_USERS be finally implemented in a later release, the implementation should sub class Create_native_func in sql/item_create.cc. For example, see the class Create_func_concat.
* | | | | | Merge mysql.com:/d2/hf/common/my50-commonholyfoot/hf@hfmain.(none)2007-01-031-0/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | into mysql.com:/d2/hf/common/my51-common
| * | | | | Merge mysql.com:/d2/hf/common/my41-commonholyfoot/hf@mysql.com/hfmain.(none)2007-01-031-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/d2/hf/common/my50-common
| | * | | | | warning count for embedded prepared statements addedholyfoot/hf@mysql.com/hfmain.(none)2007-01-031-0/+1
| | | | | | |
| | * | | | | merging fixholyfoot/hf@mysql.com/hfmain.(none)2007-01-021-2/+0
| | | | | | |
* | | | | | | Merge mysql.com:/d2/hf/common/my50-commonholyfoot/hf@hfmain.(none)2007-01-021-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | into mysql.com:/d2/hf/common/my51-common
| * | | | | | Merge mysql.com:/d2/hf/common/my41-commonholyfoot/hf@mysql.com/hfmain.(none)2007-01-021-0/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | into mysql.com:/d2/hf/common/my50-common
| | * | | | | merging fixholyfoot/hf@mysql.com/hfmain.(none)2007-01-021-4/+4
| | | | | | |
| | * | | | | embedded-server related fixesholyfoot/hf@mysql.com/hfmain.(none)2007-01-021-0/+6
| | | | | | |
| | * | | | | Merge bk@192.168.21.1:mysql-4.1-optholyfoot/hf@mysql.com/deer.(none)2006-12-082-1/+5
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/embt/my41-embt
| | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1kostja@bodhi.local2006-11-291-5/+9
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into bodhi.local:/opt/local/work/mysql-4.1-runtime
| | * \ \ \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com/kent-amd64.(none)2006-11-271-5/+19
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-4.1-merge
| * | \ \ \ \ \ \ \ Merge mysql.com:/d2/hf/clean/my50-cleanholyfoot/hf@mysql.com/hfmain.(none)2006-12-312-1/+7
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/d2/hf/common/my50-common
| | * \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@mysql.com/deer.(none)2006-12-082-1/+7
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/embt/my50-embt
* | | | | | | | | | | Merge mysql.com:/d2/hf/clean/my51-cleanholyfoot/hf@hfmain.(none)2006-12-313-5/+33
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/d2/hf/common/my51-common
| * | | | | | | | | | | WL#3630 (add embedded server to pushbuild)holyfoot/hf@mysql.com/hfmain.(none)2006-12-282-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5.1-related fixes libmysqld/Makefile.am fixed to recompile and link ha_*.cc files that keep dependance on THD structure. Minor fixes to make tests working.
| * | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.1-optholyfoot/hf@deer.(none)2006-12-082-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/embt/my51-embt
| | * | | | | | | | | | Merge mysql.com:/home/hf/work/embt/my50-embtholyfoot/hf@deer.(none)2006-11-132-1/+7
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/embt/my51-embt
| | | * | | | | | | | | several fixes to make tests pass in embedded-server modeholyfoot/hf@mysql.com/deer.(none)2006-11-131-0/+2
| | | | | | | | | | | |
| | | * | | | | | | | | Merge mysql.com:/home/hf/work/embt/my41-embtholyfoot/hf@mysql.com/deer.(none)2006-11-132-1/+5
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/embt/my50-embt
View Lorry Controller Status