tsmith@quadxeon.mysql.com
4981d45997
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-03-21 23:58:02 +01:00
iggy@recycle.(none)
0d3aefcdf4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into recycle.(none):/src/bug23736/my51-bug23736
2007-03-21 13:39:08 -04:00
iggy@recycle.(none)
a56b04476a
Merge recycle.(none):/src/bug23736/my50-bug23736
...
into recycle.(none):/src/bug23736/my51-bug23736
2007-03-20 10:54:56 -04:00
iggy@recycle.(none)
988ce58052
Bug#23736 Pointer free error in mysqlbinlog
...
- Mis-matched SAFEMALLOC defines caused misleading error message.
2007-03-20 10:34:25 -04:00
df@pippilotta.erinye.com
8161dcaacb
build fix for netware
2007-03-20 13:32:49 +01:00
tsmith@quadxeon.mysql.com
6252477a7b
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-03-19 23:10:58 +01:00
kostja@bodhi.local
bdb10baec1
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-03-20 00:42:11 +03:00
kostja@bodhi.local
a9065201d5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2007-03-19 23:59:53 +03:00
jani@ua141d10.elisa.omakaista.fi
6e9add70ec
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-03-19 11:22:10 +02:00
jani@ua141d10.elisa.omakaista.fi
71c7035035
Added find_type_or_exit and find_bit_type_or_exit as wrappers
...
around the original functions. These will ensure that error
message is always in unique form, reduce code and print the
right alternatives automatically in an error case.
2007-03-19 11:19:51 +02:00
serg@janus.mylan
e9fb4a686f
dbug/dbug.c: unused variable removed
...
include/config-win.h: SIZEOF_INT
include/my_global.h: win64 fix
support-files/Makefile.am: automake magic
2007-03-17 11:19:21 +01:00
serg@janus.mylan
68fd66e853
wl#3700 - post-review fixes:
...
s/ulonglong/key_part_map/, comments
2007-03-17 00:13:25 +01:00
serg@janus.mylan
f813272125
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-03-16 14:09:30 +01:00
malff/marcsql@weblab.(none)
e677c6e70f
Manual merge from 5.0-runtime to 5.1-runtime
2007-03-14 17:38:06 -06:00
kent@kent-amd64.(none)
9d396c6996
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-12 13:29:11 +01:00
kent@mysql.com/kent-amd64.(none)
30537c7d75
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-12 13:22:02 +01:00
kent@mysql.com/kent-amd64.(none)
cad1c35618
Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
...
into mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-03-12 13:15:11 +01:00
kent@mysql.com/kent-amd64.(none)
4e4f184170
Makefile.am, configure.in, mysys.dsp:
...
Removed unused files
.del-my_winsem.c:
Delete: mysys/my_winsem.c
.del-my_semaphore.c:
Delete: mysys/my_semaphore.c
.del-my_semaphore.h:
Delete: include/my_semaphore.h
2007-03-12 13:12:42 +01:00
Kristofer.Pettersson@naruto.
ab28345a4b
Merge naruto.:C:/cpp/bug25042/my50-bug25042
...
into naruto.:C:/cpp/mysql-5.0-maint
2007-03-09 08:02:29 +01:00
anozdrin/alik@booka.opbmk
c666e2f276
Polishing: use constants instead of magic numbers.
2007-03-09 08:05:08 +03:00
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
serg@janus.mylan
6aa5c001c5
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-03-06 13:44:57 +01:00
msvensson@pilot.blaudden
f5778fc73e
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-01 18:12:56 +01: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@ua141d10.elisa.omakaista.fi
bcbc0031eb
Fixed compiler warnings.
2007-02-28 22:23:35 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
6163508f85
Fixes for compiler warnings.
2007-02-27 11:27:04 +02:00
serg@janus.mylan
30321673a2
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-02-26 16:12:40 +01: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
monty@mysql.com/narttu.mysql.fi
e5cc397f33
Fixed compiler warnings (for linux and win32 and win64)
...
Fixed a couple of usage of not initialized warnings (unlikely cases)
2007-02-22 16:59:57 +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
monty@mysql.com/narttu.mysql.fi
26aa385bc5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2007-02-21 14:07:08 +02:00
monty@mysql.com/narttu.mysql.fi
222e128b34
Fixed unsafe define of uint4korr()
...
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
2007-02-21 13:02:57 +02:00
serg@janus.mylan
689eed7406
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-02-21 11:36:23 +01:00
joerg@trift2.
0cdbda1273
include/config-win.h :
...
Companion change to this one
ChangeSet@1.2206 , 2007-01-22 02:32:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -0
include/my_pthread.h@1.67 , 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +31 -10
which renamed "sigset()" -> "my_sigset()" but forgot to do it for Windows ...
2007-02-16 16:31:31 +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