summaryrefslogtreecommitdiff
path: root/server-tools
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | |
* | | | | Polishing:anozdrin/alik@alik.opbmk2007-02-204-39/+59
| | | | | | | | | | | | | | | | | | | | | | | | | 1. use MySQL headers instead of system ones; 2. move logical part of code into a separate function.
* | | | | Fix Windows build.anozdrin/alik@alik.opbmk2007-02-201-1/+1
| | | | |
* | | | | Fix build failures on Windows and Mac.anozdrin/alik@booka.2007-02-202-0/+2
| | | | |
* | | | | Patch for IM in scope of working on BUG#24415: Instance manager testanozdrin/alik@alik.opbmk2007-02-1813-340/+646
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | im_daemon_life_cycle fails randomly. 1. Move IM-angel functionality into a separate file, create Angel class. 2. Be more verbose; 3. Fix typo in FLUSH INSTANCES implementation; 4. Polishing.
* | | | Merge 192.168.0.10:mysql/mysql-5.1-maintmsvensson@pilot.mysql.com2007-02-061-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
| * | | | Fix windows buildmsvensson@pilot.mysql.com2007-02-061-1/+1
| | | | |
* | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1msvensson@neptunus.(none)2007-02-062-11/+10
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
| * | | | Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-272-11/+10
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| 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-229-17/+18
| | |\ \ | | | |/ | | |/| | | | | into mysql.com:/home/my/mysql-5.0
| | | * Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-159-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 pilot.mysql.com:/home/msvensson/mysql/mysql-5.0msvensson@pilot.mysql.com2007-01-171-5/+5
| | |\ \ | | | | | | | | | | | | | | | into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
| | | * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2007-01-111-5/+5
| | | |\ \ | | | | | | | | | | | | | | | | | | into bodhi.local:/opt/local/work/mysql-5.0-runtime
| | * | \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2007-01-1129-41/+173
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
| | * | | | Merge siva.hindu.god:/usr/home/tim/m/bk/g50tsmith/tim@siva.hindu.god2006-12-2641-82/+41
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/usr/home/tim/m/bk/50
* | | | | | | Bug#22579 use --warning-mode=pedantic and -std=c89 flags when compiling with gccmsvensson@neptunus.(none)2007-01-292-4/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | - Reorganize include file order to avoid problem with gcc 2.95.3 - Compiler is confused by forward class declarations
* | | | | | Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51tsmith@siva.hindu.god2007-01-182-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
| * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2007-01-073-7/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
| | * \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/g51tsmith/tim@siva.hindu.god2006-12-263-7/+5
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26
| | | * | | | | | Changed config of mysqlmanager to use my.cnf search path.mtaylor@qualinost.(none)2006-12-151-1/+1
| | | | | | | | |
| | | * | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/50tsmith/tim@siva.hindu.god2006-12-142-6/+4
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | into siva.hindu.god:/usr/home/tim/m/bk/51
| | | | * | | | | BUG#24687 func_misc test fails on win64msvensson@shellback.2006-12-142-6/+4
| | | | | |_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use same precision (milliseconds) for all time functions used when calculating time for pthread_cond_timedwait - Use 'GetSystemTimeAsFileTime' for both start and curr time
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2007-01-1213-962/+1373
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into bodhi.local:/opt/local/work/mysql-5.1-runtime
| * \ \ \ \ \ \ \ Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-01-0213-962/+1373
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | into weblab.(none):/home/marcsql/TREE/mysql-5.1-merge
| | * | | | | | | Post-merge fixes.kostja@bodhi.local2006-12-121-2/+1
| | | | | | | | |
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-12-1213-961/+1373
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | into bodhi.local:/opt/local/work/mysql-5.1-runtime
| | | * | | | | | Merge outpost.site:/home/cps/mysql/trees/5.0-runtime-19044petr/cps@outpost.site2006-12-041-5/+5
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | | | | | | | | | | | into outpost.site:/home/cps/mysql/trees/5.1-runtime-19044