summaryrefslogtreecommitdiff
path: root/libmysql
Commit message (Collapse)AuthorAgeFilesLines
* Post Merge Fixup.iggy@amd64.(none)2007-08-041-14/+14
|
* Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-builddf@pippilotta.erinye.com2007-08-041-14/+41
|\ | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
| * Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-newkent@kent-amd64.(none)2007-08-031-14/+42
| |\ | | | | | | | | | into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
| | * CMakeLists.txt, README, configure.jskent@mysql.com/kent-amd64.(none)2007-08-031-14/+42
| | | | | | | | | | | | | | | Several adjustments to make client libraries pass the link test on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)
| | * CMakeLists.txt (several), make_win_bin_dist:kent@mysql.com/kent-amd64.(none)2007-08-021-16/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aligned client library build and use with the Unix version when it comes to what source to include directly in the builds, and what libraries to link with (bug#30118). Also reviewed, corrected and made more clear when static or dynamic Thread Local Storage is to be used. Some code duplication was removed, and some redundant library usage were removed, reducing the risk of incorrect TLS usage.
* | | merge fixdf@pippilotta.erinye.com2007-08-031-1/+2
| | |
* | | Merge bk-internal:/home/bk/mysql-5.1-marveldf@pippilotta.erinye.com2007-08-032-2/+2
|\ \ \ | |/ / |/| | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines
| * | Fixes Bug#30127: --debug-info no longer prints memory usage in mysqlmonty@mysql.com/nosik.monty.fi2007-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | Fixed compiler warnings, errors and link errors Fixed new bug on Solaris with gethrtime() Added --debug-check option to all mysql clients to print errors and memory leaks Added --debug-info to all clients. This now works as --debug-check but also prints memory and cpu usage
| * | Slow query log to file now displays queries with microsecond precissionmonty@mysql.com/nosik.monty.fi2007-07-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --long-query-time is now given in seconds with microseconds as decimals --min_examined_row_limit added for slow query log long_query_time user variable is now double with 6 decimals Added functions to get time in microseconds Added faster time() functions for system that has gethrtime() (Solaris) We now do less time() calls. Added field->in_read_set() and field->in_write_set() for easier field manipulation by handlers set_var.cc and my_getopt() can now handle DOUBLE variables. All time() calls changed to my_time() my_time() now does retry's if time() call fails. Added debug function for stopping in mysql_admin_table() when tables are locked Some trivial function and struct variable renames to avoid merge errors. Fixed compiler warnings Initialization of some time variables on windows moved to my_init()
* | | Re-apply fixes originally made by Kent, joerg@trift2.2007-08-031-13/+43
| | | | | | | | | | | | | | | | | | | | | they got lost because of a merge conflict with the CMakeLists.txt dependency fix (numer 29982 in our bugs DB). These changes are for bug#30118.
* | | Fix a bad BitKeeper dependency structure for the "CMakeLists.txt" files.joerg@trift2.2007-07-311-0/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They had been introduced in 5.1 and were only later backported to 5.0; as a consequence, the files in the 5.1 tree do not depend on the 5.0 ones, and changes in 5.0 do not propagate into the 5.1 files. To fix this, the (previous) files in 5.1 now are deleted ("bk rm"), and the previously deleted files depending on 5.0 are now moved to the respective source directories ("bk mv"). The current 5.1 contents is restored in these files. If you need the previous history of the 5.1 files ("bk revtool"), access those in "BitKeeper/deleted". Contrary to the original plan, I did not introduce the name "CMakeLists.historic" - mostly in order not to clutter the source tree. This fixes bug#29982.
* | Merge mysql.com:/home/hf/work/29687/my50-29687holyfoot/hf@hfmain.(none)2007-07-191-1/+1
|\ \ | |/ | | | | into mysql.com:/home/hf/work/29687/my51-29687
| * Bug #29687 mysql_stmt_store_result memory leak in libmysqldholyfoot/hf@mysql.com/hfmain.(none)2007-07-161-1/+1
| | | | | | | | | | | | In embedded server we use result->alloc to store field data for the result, but we didn't clean the result->alloc if the query returned an empty recordset. Cleaning for the empty recordset enabled
* | Merge labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marveljani@labbari.dsl.inet.fi2007-07-061-0/+15
|\ \ | |/ | | | | into labbari.dsl.inet.fi:/home/my/bk/mysql-5.1-marvel
| * Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@labbari.dsl.inet.fi2007-07-061-0/+15
| |\ | | | | | | | | | into labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel
| | * Allow multiple calls to mysql_server_end()monty@mysql.com/narttu.mysql.fi2007-06-201-0/+15
| | | | | | | | | | | | | | | | | | (Part of fix for Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit) Give correct error message if InnoDB table is not found (This allows us to drop a an innodb table that is not in the InnoDB registery)
* | | Merge gleb.loc:/home/uchum/work/bk/5.0-optgshchepa/uchum@gleb.loc2007-06-241-11/+16
|\ \ \ | |/ / | | | | | | into gleb.loc:/home/uchum/work/bk/5.1-opt
| * | Bug #27383: Crash in test "mysql_client_test"gkodinov/kgeorge@magare.gmz2007-06-221-11/+16
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The C optimizer may decide that data access operations through pointer of different type are not related to the original data (strict aliasing). This is what happens in fetch_long_with_conversion(), when called as part of mysql_stmt_fetch() : it tries to check for truncation errors by first storing float (and other types of data) into a char * buffer and then accesses them through a float pointer. This is done to prevent the effects of excess precision when using FPU registers. However the doublestore() macro converts a double pointer to an union pointer. This violates the strict aliasing rule. Fixed by making the intermediary variables volatile ( to not re-introduce the excess precision bug) and using the intermediary value instead of the char * buffer. Note that there can be loss of precision for both signed and unsigned 64 bit integers converted to double and back, so the check must stay there (even for compatibility reasons). Based on the excellent analysis in bug 28400.
| * Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50tsmith@quadxeon.mysql.com2007-05-301-0/+4
| |\ | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
| | * bug#28358 libmysql.dll cannot be dynamically loaded on Windowsdf@pippilotta.erinye.com2007-05-141-0/+4
| | |
| * | Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664msvensson@pilot.blaudden2007-05-241-4/+2
| |\ \ | | |/ | |/| | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| * | Bug#24732 Executables do not include Vista manifestsiggy@recycle.(none)2007-04-231-0/+5
| | | | | | | | | | | | | | | | | | - Added script to generate application specific manifest. - Added new CMake MACRO to add customer build events which will first generate a manifest and then embeds that manifest into an executable.
* | | Embedded Server doesn't build on Windows.iggy@alf.2007-06-151-1/+1
| | | | | | | | | | | | | | | | | | - Add build configuration parameter EMBEDDED_ONLY which will configure the VS solution to produce only mysql embedded binary. - Make necessary updates to successfully compile solution.
* | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51tsmith@quadxeon.mysql.com2007-06-053-8/+8
|\ \ \ | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
| * | | WL#3817: Simplify string / memory area types and make things more consistent ↵monty@mysql.com/narttu.mysql.fi2007-05-103-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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 pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664msvensson@pilot.blaudden2007-05-241-4/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| into pilot.blaudden:/home/msvensson/mysql/bug26664/my51-bug26664
| * | Bug#26664 test suite times out on OS X 64bitmsvensson@pilot.blaudden2007-05-241-4/+2
| |/ | | | | | | | | | | | | | | | | | | | | - The "mysql client in mysqld"(which is used by replication and federated) should use alarms instead of setting socket timeout value if the rest of the server uses alarm. By always calling 'my_net_set_write_timeout' or 'my_net_set_read_timeout' when changing the timeout value(s), the selection whether to use alarms or timeouts will be handled by ifdef's in those two functions. - Move declaration of 'vio_timeout' into "vio_priv.h"
| * Merge siva.hindu.god:/home/tsmith/m/bk/maint/mar05/50tsmith@siva.hindu.god2007-03-061-1/+1
| |\ | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/maint/50
| * | Fixed compiler warnings (for linux and win32 and win64)monty@mysql.com/narttu.mysql.fi2007-02-221-1/+0
| | | | | | | | | | | | Fixed a couple of usage of not initialized warnings (unlikely cases)
* | | Bug#24732 Executables do not include Vista manifestsiggy@recycle.(none)2007-04-231-0/+6
| | | | | | | | | | | | - Post merge cleanup.
* | | Merge siva.hindu.god:/home/tsmith/m/bk/51tsmith@siva.hindu.god2007-04-183-3/+6
|\ \ \ | | | | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/maint/51
| * | | Added more descriptive error message of why statement was automaticly droppedmonty@mysql.com/narttu.mysql.fi2007-04-133-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Print information if net_clear() skipped bytes (As this otherwise hides critical timeing bugs) Added DBUG_ASSERT if we get packets out of order mysql_change_user() could on error send multiple packets, which caused mysql_client_test to randomly fail
* | | | Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508msvensson@pilot.blaudden2007-04-112-3/+6
|\ \ \ \ | |/ / / |/| | | | | | | 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-3/+6
| | | | | | | | | | | | | | | | | | | | - Move the link_sources command from top level Makefile into each subdir that need to link files
* | | | Merge siva.hindu.god:/home/tsmith/m/bk/maint/mar05/50tsmith@siva.hindu.god2007-03-061-1/+1
|\ \ \ \ | | |_|/ | |/| | | | | | into siva.hindu.god:/home/tsmith/m/bk/maint/mar05/51
| * | | Fix for bug #25595 "missing DBUG_RETURN in function "mysql_stat""tsmith@siva.hindu.god2007-03-061-1/+1
| | | |
* | | | Fixed compiler warningsmonty@mysql.com/narttu.mysql.fi2007-02-231-1/+0
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-271-121/+129
|\ \ \ | | |/ | |/| | | | | | | 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-121/+129
| |\ \ | | |/ | |/| | | | 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-121/+129
| | |\ | | | | | | | | | | | | 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-121/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50tsmith@siva.hindu.god2007-01-181-3/+11
|\ \ \ \ | |/ / / | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
| * | | Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518msvensson@neptunus.(none)2007-01-161-3/+11
| |\ \ \ | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| | * | | Bug#15518 Reusing a stmt that has failed during prepare does not clear errormsvensson@neptunus.(none)2007-01-161-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Always reset error when calling mysql_stmt_prepare a second time - Set stmt->state to MYSQL_STMT_INIT_DONE before closing prepared stmt in server. - Add test to mysql_client_test - Remove mysql_stmt_close in mysqltest after each query - Close all open statements in mysqltest if disable_ps_protocol is called.
* | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-311-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header Added GPL copyright text my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc: Changed copyright header formatting some plugin_example.c, daemon_example.c: Added "Copyright (C) 2006 MySQL AB" to GPL header
* | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-312-1/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | into mysql.com:/home/kent/bk/main/mysql-5.1
| * | | | my_strtoll10-x86.s:kent@mysql.com/kent-amd64.(none)2006-12-313-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected spelling in copyright text Makefile.am: Don't update the files from BitKeeper Many files: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header Many files: Added GPL copyright text Removed files: Docs/Support/colspec-fix.pl Docs/Support/docbook-fixup.pl Docs/Support/docbook-prefix.pl Docs/Support/docbook-split Docs/Support/make-docbook Docs/Support/make-makefile Docs/Support/test-make-manual Docs/Support/test-make-manual-de Docs/Support/xwf
* | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-231-2/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | into mysql.com:/home/kent/bk/main/mysql-5.1
| * | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
| | |/ / | |/| | | | | | | | | | Changed header to GPL version 2 only
| * | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marveldf@kahlann.erinye.com2006-12-011-3/+7
| |\ \ \ | | | |/ | | |/| | | | | into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build