summaryrefslogtreecommitdiff
path: root/server-tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-mainttnurnberg@sin.intern.azundris.com2007-09-151-1/+1
|\ | | | | | | into mysql.com:/home/tnurnberg/15327/51-15327
| * Merge mysql.com:/home/tnurnberg/15327/50-15327tnurnberg@sin.intern.azundris.com2007-09-151-1/+1
| |\ | | | | | | | | | into mysql.com:/home/tnurnberg/15327/51-15327
| | * Bug #15327: configure: --with-tcp-port option being partially ignoredtnurnberg@mysql.com/sin.intern.azundris.com2007-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make sure that if builder configured with a non-standard (!= 3306) default TCP port that value actually gets used throughout. if they didn't configure a value, assume "use a sensible default", which will be read from /etc/services or, failing that, from the factory default. That makes the order of preference - command-line option - my.cnf, where applicable - $MYSQL_TCP_PORT environment variable - /etc/services (unless configured --with-tcp-port) - default port (--with-tcp-port=... or factory default)
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marveljbruehe/mysqldev@mysql.com/production.mysql.com2007-08-161-1/+1
|\ \ \ | | | | | | | | | | | | into mysql.com:/data0/mysqldev/my/mysql-5.1-30367
| * | | CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:kent@mysql.com/kent-amd64.(none)2007-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional changes for bug#29903 - Changed to do embedded build part as normal build, when WITH_EMBEDDED_SERVER is set. - Allow both normal and debug build with embedded. - Build static embedded library by pointing out all source and compile it all, i.e. not building libraries from libraries, not portable. - Let embedded use generated files from the "sql" directory, added dependencies to make sure built before embedded. - Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only linked in when debug target is used. - Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as others can't depend on it, not defined at configure time. Instead set the output file name. - Created work around for bug in CMake 2.4.6 and output names, to set the "mysqld<suffix>.pdb" name to the same base name. - Set the correct manifest "name" (patch by iggy)
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2007-08-142-1/+6
|\ \ \ \ | |/ / / |/| | | | | | | into mysql.com:/home/my/mysql-5.1
| * | | Fixed a lot of compiler warnings and errors detected by Forte C++ on Solarismonty@mysql.com/nosik.monty.fi2007-08-132-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Faster thr_alarm() Added 'Opened_files' status variable to track calls to my_open() Don't give warnings when running mysql_install_db Added option --source-install to mysql_install_db I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems index_read() -> index_read_map() index_read_idx() -> index_read_idx_map() index_read_last() -> index_read_last_map()
* | | | Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-newkent@kent-amd64.(none)2007-08-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Several adjustments to make client libraries pass the link test on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)
| * | | | configure.in:kent/mysqldev@mysql.com/production.mysql.com2007-06-201-1/+3
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Added --with-system-type=<systype> and --with-machine-type=<machtype> options, to be able to override the one detected, for --version strings field.cc, field.h, listener.cc: C++ compatibility change for IBM VisualAge 6 and i5/OS
| * | | Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664msvensson@pilot.blaudden2007-05-241-2/+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.
* | | | | Merge trift2.:/MySQL/M51/bug29982-5.1joerg@trift2.2007-08-021-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| * | | | 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.
* | | | Fix for BUG#28030: test im_instance_conf fails with an assert.anozdrin/alik@ibm.2007-07-274-7/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was a race condition on shutdown -- when IM got shutdown request while a guarded mysqld is starting. In this case the Guardian thread tried to stop the mysqld, but might fail if the mysqld hadn't created pid-file so far. When this happened, the mysqld-monitor thread didn't stop, so the assert in Thread_registry happened. The fix is to make several attempts to stop mysqld if it is active.
* | | | Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeKristofer.Pettersson@naruto.2007-07-251-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | into naruto.:C:/cpp/mysql-5.1-runtime
| * | | | Fix of build errors for windows.Kristofer.Pettersson@naruto.2007-07-251-2/+2
| | | | |
* | | | | Temporary enable IM tests in 5.1-runtime tree.anozdrin/alik@ibm.2007-07-251-2/+1
|/ / / / | | | | | | | | | | | | Enable assert in Thread_registry.
* | | | Bug#28012 Patch : IM crashes instead of reporting an error when mysqldpath ↵thek@adventure.(none)2007-07-235-94/+377
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is bad On the windows platform, if an instance object failed to initialize during program start, the instance manager would crash. This could happen if an incorrect mysqld path was supplied in the defaults configuration file. The patch prevents the program from crashing and makes it show an error message instead.
* | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51tsmith@quadxeon.mysql.com2007-06-0512-128/+131
|\ \ \ | | | | | | | | | | | | 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-1012-128/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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-2/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| into pilot.blaudden:/home/msvensson/mysql/bug26664/my51-bug26664
| * | Bug#26664 test suite times out on OS X 64bitmsvensson@pilot.blaudden2007-05-241-2/+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"
* | thread_registry.cc:mjorgensen@blade09.mysql.com2007-04-251-1/+2
| | | | | | | | Disable assert causing bug # 28030 temporarily, since it's non-critical, and the bug have been filed
* | Bug#24732 Executables do not include Vista manifestsiggy@recycle.(none)2007-04-231-0/+5
| | | | | | | | - Post merge cleanup.
* | Clear field_alloc when it's moved to result set (allows us to always call ↵monty@mysql.com/narttu.mysql.fi2007-04-162-5/+10
| | | | | | | | | | | | | | | | | | free_root on field_alloc) Change to use remove_file instead of 'system rm' in a lot of tests. (Should fix some windows test problems) Removed memory leak in mysql_test if sync_with_master fails. Do not terminate ndb_cluster_binary_log before the util thread has finnished. This should fix a shutdown bug where a thread is accessing injector_mutex after it's freed. Patch may fix Bug#27622 "mysqld shutdown, util thread continues, while binlog thread exits"
* | Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-buildkent@kent-amd64.(none)2007-03-201-8/+17
|\ \ | |/ | | | | into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
| * Many files:kent@mysql.com/kent-amd64.(none)2007-03-191-8/+17
| | | | | | | | Major cleanup of old Visual Studio project files, aligning engines etc
| * Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-basemalff/marcsql@weblab.(none)2007-03-017-22/+56
| |\ | | | | | | | | | into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
| | * Fix for BUG#22511: IM does not remove angel-pid-file on clean shutdownanozdrin/alik@booka.opbmk2007-02-241-0/+4
| | |
| | * Fix shutdown delay option name according to The Manual.anozdrin/alik@booka.opbmk2007-02-241-1/+1
| | |
| * | Fixed compiler warnings (for linux and win32 and win64)monty@mysql.com/narttu.mysql.fi2007-02-222-2/+2
| | | | | | | | | | | | Fixed a couple of usage of not initialized warnings (unlikely cases)
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@janus.mylan2007-03-161-0/+0
|\ \ \ | | | | | | | | | | | | into janus.mylan:/usr/home/serg/Abk/mysql-5.1
| * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@janus.mylan2007-03-061-4/+4
| |\ \ \ | | | | | | | | | | | | | | | into janus.mylan:/usr/home/serg/Abk/mysql-5.1
| * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@janus.mylan2007-02-265-6/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into janus.mylan:/usr/home/serg/Abk/mysql-5.1
| * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@janus.mylan2007-02-211-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into janus.mylan:/usr/home/serg/Abk/mysql-5.1
| | * | | | | /usr/share/aclocal/mysql.m4serg@janus.mylan2007-02-141-0/+0
| | | | | | |
* | | | | | | Merge BUG: Windows target won't compile.Kristofer.Pettersson@naruto.2007-03-021-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - winsock2.h must be included before windows.h
* | | | | | | Fixed compiler warningsmalff/marcsql@weblab.(none)2007-03-011-2/+0
| | | | | | |
* | | | | | | Manual merge of 5.1 into 5.1-runtimemalff/marcsql@weblab.(none)2007-03-011-1/+1
| | | | | | |
* | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-02-285-9/+9
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
| * | | | | | Remove compiler warningsmonty@mysql.com/narttu.mysql.fi2007-02-271-4/+4
| | |_|/ / / | |/| | | |
| * | | | | 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-234-5/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Remove DBUG_ASSERT() -- essential functionality can not beanozdrin/alik@booka.opbmk2007-02-241-8/+8
| | | | | | | | | | | | | | | | | | | | wrapped by DBUG_ASSERT().
* | | | | Fix merge.anozdrin/alik@booka.opbmk2007-02-241-0/+6
| | | | |
* | | | | Merge fix.anozdrin/alik@alik.opbmk2007-02-222-8/+11
| | | | |
* | | | | Merge alik.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rtanozdrin/alik@alik.opbmk2007-02-224-4/+31
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | into alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merge
| * | | | Fix for BUG#24415: Instance manager test im_daemon_life_cycle fails randomly.anozdrin/alik@alik.opbmk2007-02-206-21/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cause of im_daemon_life_cycle.imtest random failures was the following behaviour of some implementations of LINUX threads: let's suppose that a process has several threads (in LINUX threads, there is a separate process for each thread). When the main process gets killed, the parent receives SIGCHLD before all threads (child processes) die. In other words, the parent receives SIGCHLD, when its child is not completely dead. In terms of IM, that means that IM-angel receives SIGCHLD when IM-main is not dead and still holds some resources. After receiving SIGCHLD, IM-angel restarts IM-main, but IM-main failed to initialize, because previous instance (copy) of IM-main still holds server socket (TCP-port). Another problem here was that IM-angel restarted IM-main only if it was killed by signal. If it exited with error, IM-angel thought it's intended / graceful shutdown and exited itself. So, when the second instance of IM-main failed to initialize, IM-angel thought it's intended shutdown and quit. The fix is 1. to change IM-angel so that it restarts IM-main if it exited with error code; 2. to change IM-main so that it returns proper exit code in case of failure.
* | | | | Fix powermacg5 build failure.anozdrin/alik@alik.opbmk2007-02-221-0/+1
| | | | |