lars/lthalmann@dl145j.mysql.com
771e05d657
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-03-29 13:49:10 +02:00
bar@mysql.com
3099b103ce
Merge mysql.com:/home/bar/mysql-5.0.b22378
...
into mysql.com:/home/bar/mysql-5.1-new-rpl
2007-03-29 10:03:59 +05:00
bar@mysql.com
daa7e9c386
Bug#22378 Make error, strings/ctype-utf8.c, uni_plane undeclared
...
- Fixing utf8_general_cs according to recent changes.
- Compiling utf8_general_cs in pentium-debug-max configuration
to avoid these problems in the future.
2007-03-27 15:06:41 +05:00
joerg@trift2.
2e5e79cf37
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-03-23 10:57:17 +01:00
df@pippilotta.erinye.com
dc710af806
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-03-21 15:53:11 +01:00
df@pippilotta.erinye.com
306af19625
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-26701
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701
2007-03-21 15:52:24 +01:00
df@pippilotta.erinye.com
677ca6bb5b
fix shell script
2007-03-21 15:49:51 +01:00
df@pippilotta.erinye.com
90da5ed40f
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-03-21 15:00:55 +01:00
df@pippilotta.erinye.com
4cae191d01
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-26701
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701
2007-03-21 14:58:12 +01:00
tsmith@quadxeon.mysql.com
0eae26ef57
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-19 23:36:38 +01:00
df@pippilotta.erinye.com
1b84cb44b3
Modify BUG#26701 patch and a different location to also use the correct arguments for GCC 5 and 6.
2007-03-19 16:15:47 +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
guilhem@gbichot4.local
d993ea6c5d
Fix for BUG#26971 "BUILD/check-cpu does not recognize Intel Core 2
...
Duo T7400". Treat such CPU as Xeon. Here's /proc/cpuinfo for T7400:
model name : Intel(R) Core(TM)2 CPU T7400 @ 2.16GHz
2007-03-09 14:39:24 +01:00
holyfoot/hf@hfmain.(none)
cdcf3ec097
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-08 22:04:17 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
11dd0fa326
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-08 21:42:41 +04:00
holyfoot/hf@hfmain.(none)
75be7cd1ae
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-08 19:08:28 +04:00
msvensson@pilot.blaudden
1c5c12ac5e
Add hint about using --help to see what options are available
2007-03-02 15:21:01 +01:00
df@pippilotta.erinye.com
6bce4753ad
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-26701
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701
2007-03-01 21:00:46 +01:00
df@pippilotta.erinye.com
2658b0853b
BUG#26701 check-cpu compile flags in x86-64 doesn't support gcc < 3.4,
...
apply suggestion from jocelyn fournier
2007-03-01 20:58:51 +01:00
gkodinov/kgeorge@magare.gmz
360b063d3f
Correctly recognize Intel Core2Duo Extreme
...
in build.
2007-03-01 15:28:10 +02:00
df@pippilotta.erinye.com
b830538322
BUG#20013 No pentium_cflags in SETUP.sh
...
---
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-20013
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
---
reorder lines from BUG#20013 to resemble order in 5.0
2007-02-26 17:06:10 +01: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
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
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
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
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
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
dae855c168
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-01 17:10:09 +01:00
df@kahlann.erinye.com
455b903f28
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-25530
2007-01-30 13:53:48 +01: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@mysql.com/narttu.mysql.fi
410fc81a72
After merge fixes
...
Removed a lot of compiler warnings
Removed not used variables, functions and labels
Initialize some variables that could be used unitialized (fatal bugs)
%ll -> %l
2007-01-29 01:47:35 +02:00
serg@janus.mylan
b9008b0e1b
BUILD scripts: s/(dist)?clean/maintainer-clean/
2007-01-28 21:09:54 +01: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
jani/jamppa@bk-internal.mysql.com
181865cac3
SETUP.sh:
...
Don't use -Wshadow by default yet
2007-01-25 13:12:02 +01:00
jani/jamppa@bk-internal.mysql.com
dd6292d6d1
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-01-25 12:28:00 +01:00
df@kahlann.erinye.com
d938549e2e
merge fix
2007-01-25 09:18:10 +01:00
df@kahlann.erinye.com
fdd8410e59
BUG#25530 --with-readline fails with commercial source packages
2007-01-25 08:46:07 +01:00
monty@narttu.mysql.fi
c022454e7c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2007-01-24 19:53:51 +02:00
acurtis/antony@ltamd64.xiphis.org
37f76ab496
Merge xiphis.org:/home/antony/work2/p1-bug25396.4
...
into xiphis.org:/home/antony/work2/p1-bug25396.5
2007-01-23 08:34:50 -08:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
fddb97da98
Bug#25396
...
"Valgrind leak in closecon_handlerton"
plugin_shutdown() calls plugin_deinitialize() which calls ha_finalize_handlerton().
ndbcluster_end() fails to wait for the ndb utility thread to exit which results in
the handlerton struct being freed before the ndb utility thread has destroyed it's THD
but before the plugin has been marked as UNINITIALIZED
Bug is caused by misuse of abort_loops variable and not locking mutex during calls to
pthread condition variable functions causing a race in valgrind's pthread_cond_wait
implementation.
2007-01-23 05:09:14 -08:00
joerg@trift2.
021d31180c
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-build
...
into trift2.:/MySQL/M41/push-4.1
2007-01-23 10:47:21 +01:00
monty@narttu.mysql.fi
7df1dbcd74
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2007-01-22 19:18:22 +02:00
monty@mysql.com/narttu.mysql.fi
2dcc7110c9
Give warnings for unused objects
...
Changed error message to be compatible with old error file
Added new error message for new DUP_ENTRY syntax
2007-01-22 18:42:52 +02:00
df@kahlann.erinye.com
064b77a890
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work1-testcases-20061
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
2007-01-22 16:37:27 +01:00
df@kahlann.erinye.com
9ed4299e22
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work1-testcases-20061
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2007-01-22 16:35:36 +01:00
df@kahlann.erinye.com
58bf072264
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work1-testcases-20061
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
2007-01-22 16:30:53 +01: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