tsmith@quadxeon.mysql.com
79191807ff
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51
2007-03-07 07:21:24 +01:00
kostja@bodhi.local
3d488d496d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2007-03-06 16:44:14 +03:00
msvensson@pilot.blaudden
51a71fb667
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-01 14:53:32 +01:00
malff/marcsql@weblab.(none)
dc98aa82ab
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-02-28 18:14:56 -07:00
lars/lthalmann@dl145k.mysql.com
504b4d2dfb
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-02-28 22:32:44 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
6163508f85
Fixes for compiler warnings.
2007-02-27 11:27:04 +02:00
lars/lthalmann@dl145j.mysql.com
e1867c3156
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-02-25 00:12:14 +01:00
mats@romeo.(none)
0a2e305c02
Changes to fix building on Windows.
2007-02-24 17:33:58 +01:00
lars/lthalmann@dl145h.mysql.com
8b39189ee4
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-02-24 11:52:08 +01:00
monty@mysql.com/narttu.mysql.fi
520d1b4144
Fixed compilations problems and warnings on windows
2007-02-23 22:48:15 +02:00
mats@romeo.(none)
54b04ff5c8
BUG#19033 (RBR: slave does not handle schema changes correctly):
...
Post-merge fixes.
2007-02-23 18:54:26 +01:00
msvensson@pilot.blaudden
cb8cbe0033
Bug#26536 func_time failure on vm-win2003-64-b, occurs every time
...
- Fixes for 5.1
- Always use long for my_time_t
2007-02-23 17:59:07 +01:00
msvensson@pilot.blaudden
b4d06c0d83
Merge pilot.blaudden:/home/msvensson/mysql/bug26536/my50-bug26536
...
into pilot.blaudden:/home/msvensson/mysql/bug26536/my51-bug26536
2007-02-23 17:34:19 +01:00
msvensson@pilot.blaudden
7e292b9a9a
Bug#26536 func_time failure on vm-win2003-64-b, occurs every time
...
- Avoid overflow in sec_since_epoch by shifting the time
back 2 days for times close to the maximum range of my_time_t
- Improve comment about why we need my_time_t
- Patch will also fix timezone2.test
2007-02-23 17:33:11 +01:00
monty@mysql.com/narttu.mysql.fi
f0ae3ce9b9
Fixed compiler warnings
...
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
2007-02-23 13:13:55 +02:00
Kristofer.Pettersson@naruto.
63c3819d03
Merge naruto.:C:/cpp/bug25042/my50-bug25042
...
into naruto.:C:/cpp/mysql-5.1-maint
2007-02-21 16:26:33 +01:00
Kristofer.Pettersson@naruto.
6c9fd8599d
Merge naruto.:C:/cpp/bug25042/my50-bug25042
...
into naruto.:C:/cpp/mysql-5.1-runtime
2007-02-21 14:01:05 +01:00
Kristofer.Pettersson@naruto.
cd0a43f528
Bug#25042 OPTIMIZE TABLE cause race condition in IO CACHE SHARE
...
- The condition variable implementation "lost" a signal to
WaitOnSingleObject when a semaphore was released.
- The signal could be consumed by a new call to pthread_cond_wait
before all waiting threads had awoken.
- The new implementation of pthread_cond_* uses events
instead of semaphores. It also uses an extra lock to protect entry
into new cond wait before the broadcast has finished.
2007-02-15 14:08:21 +01:00
istruewing@chilla.local
4b179a97b8
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into chilla.local:/home/mydev/mysql-5.1-bug25460-old
2007-02-13 17:21:12 +01:00
istruewing@chilla.local
1b35f19223
Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
...
Under high load it was possible that memory mapping was started on a table
while other threads were working with the table.
I fixed the start of memory mapping so that it is done at the first table
open or when the requesting thread is using the table exclusively only.
2007-02-13 16:33:32 +01:00
svoj@mysql.com/april.(none)
db8a7b513c
Excluded wrongly merged changeset.
2007-02-07 01:37:21 +04:00
svoj@june.mysql.com
4a6770e06e
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-02-05 15:31:20 +04:00
jani@a88-113-38-195.elisa-laajakaista.fi
cd75806b61
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
2007-02-03 00:58:09 +02:00
istruewing@chilla.local
80ca34c3a8
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-02 11:34:22 +01:00
istruewing@chilla.local
1616e201d8
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-02 10:03:22 +01:00
istruewing@chilla.local
3a664472de
After merge fix
2007-02-02 10:01:44 +01:00
istruewing@chilla.local
ed09987083
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-01 19:41:04 +01:00
istruewing@chilla.local
1c34270464
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-01 10:19:22 +01:00
istruewing@chilla.local
73e61944f7
Merge chilla.local:/home/mydev/mysql-4.0-axmrg
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-01 08:09:36 +01:00
jani/jamppa@production.mysql.com
0e9a64684d
Merge bk://localhost:5559
...
into production.mysql.com:/usersnfs/jamppa/mysql-4.0
2007-01-30 17:52:27 +01:00
jani@ua141d10.elisa.omakaista.fi
b3523e398c
Cleanup of thread-type (linuxthread or NTPL) detection code
...
Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
2007-01-30 18:52:26 +02:00
istruewing@chilla.local
42bd03e254
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-01-29 18:47:46 +01:00
monty@narttu.mysql.fi
bb464613ce
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2007-01-29 01:57:07 +02:00
monty@narttu.mysql.fi
8a80e36ac3
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
2007-01-27 03:46:45 +02:00
brian@zim.(none)
08e93132c4
Two things:
...
1) Two small windows cleanups for Archive.
2) Patch from Calvin for Falcon to be able to have its own I_S loaded. One example added for this, does hello world.
2007-01-26 15:36:39 -08:00
jani@ua141d10.elisa.omakaista.fi
0b4ee9e5b8
Cleanup of thread-type (linuxthread or NTPL) detection code
...
Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
2007-01-25 20:10:31 +02:00
svoj@april.(none)
3efc296508
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-01-25 01:44:30 +04:00
svoj@mysql.com/april.(none)
ea7fe60fbc
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2007-01-25 01:26:57 +04:00
monty@mysql.com/narttu.mysql.fi
120e3f5ee1
Avoid compiler warnings on powermacg5
...
Fixed compilation error when trying to compile libmysqld on powermac
2007-01-23 16:42:03 +02:00
monty@mysql.com/narttu.mysql.fi
a04157fbb3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2007-01-22 14:04:40 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
f6e70c1453
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2007-01-22 03:33:59 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
ff58749b29
Fix for configure to detect library correctly.
...
Fix to check library in use during runtime.
Fix for Bug#16995, "idle connections not being killed due to timeout when NPTL is used".
2007-01-22 02:32:07 +02:00
tsmith@siva.hindu.god
1fbf01baf0
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 10:34:51 -07:00
tsmith@siva.hindu.god
02ddf3d04c
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 10:33:28 -07:00
tsmith@siva.hindu.god
6b729ff2cd
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 10:30:39 -07:00
tsmith@siva.hindu.god
244b2004ee
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 10:06:36 -07:00
iggy@recycle.(none)
294af0a42e
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/mysql-5.0-maint
2007-01-18 11:46:29 -05:00
iggy@recycle.(none)
e6d1953c8d
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/bug22807/my51-bug22807
2007-01-18 11:40:22 -05:00
iggy@recycle.(none)
ef5f757ac2
Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
...
- Create space safe strings for system() calls in mysql_upgrade.exe
2007-01-18 11:38:05 -05:00
tsmith@siva.hindu.god
cc7afe2494
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 08:30:35 -07:00