hhunger@hh-nb.hungers
0c6e1743f4
Merge hh-nb.hungers:/work/merge/mysql-5.1-build
...
into hh-nb.hungers:/work/merge/mysql-5.1-bug32664
2008-02-22 21:24:20 +01:00
hhunger@hh-nb.hungers
e4c3928f5e
Replaced all --sleep by wait_condition (bug#32664).
2008-02-22 13:54:49 +01:00
msvensson@pilot.mysql.com
d80b1ae384
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
2008-02-21 14:11:01 +01:00
msvensson@pilot.mysql.com
6391d837a2
Merge bk-internal:/home/bk/mysql-5.0-build
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
2008-02-21 13:59:45 +01:00
msvensson@pilot.mysql.com
c317562df4
Bug#32025 ndb_waiter does too many roundtrips to ndb_mgmd
...
- fix test failures that was already there but now are
more consistent when the 1 second sleep has been removed from
ndb_waiter
2008-02-21 13:23:58 +01:00
vvaintroub@wva.
89aebb65fc
Merge vvaintroub@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into wva.:C:/bk/bug31745_2/mysql-5.0-build
2008-02-21 02:22:02 +01:00
vvaintroub@wva.
940806c2ed
Merge vvaintroub@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into wva.:C:/bk/bug31745_2/mysql-5.1-build
2008-02-21 01:53:35 +01:00
hhunger@hh-nb.hungers
f41ad6f89b
Patch for bug#32664: event.test has timeout randomly. File is split into event_1.test and event_2.test.
2008-02-20 14:40:46 +01:00
tsmith@ramayana.hindu.god
12d0319565
Merge ramayana.hindu.god:/home/tsmith/m/inno/feb18/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-19 15:00:13 -07:00
guilhem@gbichot4.local
3fe6684c48
fixes for build failures due to my yesterday's changeset forbidding
...
bool in C.
2008-02-19 18:45:11 +01:00
tsmith@ramayana.hindu.god
b8b6c7fcf7
Applied InnoDB snapshot innodb-5.1-ss2298
...
Fixes the following bugs:
- Bug #33349 : possible race condition revolving around data dictionary and repartitioning
Introduce retry/sleep logic as a workaround for a transient bug
where ::open fails for partitioned tables randomly if we are using
one file per table.
- Bug #34053 : normal users can enable innodb_monitor logging
In CREATE TABLE and DROP TABLE check whether the table in question is one
of the magic innodb_monitor tables and whether the user has enough rights
to mess with it before doing anything else.
- Bug #22868 : 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
- Bug #29560 : InnoDB >= 5.0.30 hangs on adaptive hash rw-lock 'waiting for an X-lock'
This is a combination of changes that forward port the scalability fix applied to 5.0
through r1001.
It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
scalability fix of 5.0)
Then it applies r1001 to 5.0 which is the original scalability fix.
Finally it applies r2082 which fixes an issue with the original fix.
- Bug #30930 : Add auxiliary function to retrieve THD::thread_id
Add thd_get_thread_id() function. Also make check_global_access() function
visible to InnoDB under INNODB_COMPATIBILITY_HOOKS #define.
2008-02-19 09:44:09 -07:00
vvaintroub@wva.
b609c158d8
Post-merge fix
2008-02-19 14:25:26 +01:00
vvaintroub@wva.
efa91b5479
Merge wva.:C:/bk/bug31745_2/my51_31754_2/..\my50-bug31745_2
...
into wva.:C:/bk/bug31745_2/my51_31754_2
2008-02-19 14:20:46 +01:00
vvaintroub@wva.
f5932c0d95
Bug#31745 - crash handler does not work on Windows
...
- Replace per-thread signal()'s with SetUnhandledExceptionFilter().
The only remaining signal() is for SIGABRT (default abort()
handler in VS2005 is broken, i.e removes user exception filter)
- remove MessageBox()'es from error handling code
- Windows port for print_stacktrace() and write_core()
- Cleanup, removed some unused functions
2008-02-19 12:37:39 +01:00
guilhem@gbichot4.local
045f3c4a5d
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into gbichot4.local:/home/mysql_src/mysql-5.1-build-gca
2008-02-18 23:36:57 +01:00
guilhem@gbichot4.local
9e2b31b026
Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>
...
value" error even though the value was correct): a C function in my_getopt.c
was taking bool* in parameter and was called from C++ sql_plugin.cc,
but on some Mac OS X sizeof(bool) is 1 in C and 4 in C++, giving funny
mismatches. Fixed, all other occurences of bool in C are removed, future
ones are blocked by a "C-bool-catcher" in my_global.h (use my_bool).
2008-02-18 23:29:39 +01:00
tsmith@ramayana.hindu.god
a6d50c102c
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-18 12:25:31 -07:00
tsmith@ramayana.hindu.god
732eb0b4ce
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-18 12:18:36 -07:00
tsmith@ramayana.hindu.god
71faa39360
Merge ramayana.hindu.god:/home/tsmith/m/bk/50-b28555
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-02-18 12:04:54 -07:00
tsmith@ramayana.hindu.god
958f615f36
Merge ramayana.hindu.god:/home/tsmith/m/bk/b21158/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-02-18 12:04:22 -07:00
tsmith@ramayana.hindu.god
69dcac5a7e
Bug #28555 Upgrading MySQL Fails to shut down old server and kills socket file
...
Check for an existing MySQL server package from a different vendor or
major MySQL version. In such a case, refuse to install the server and
recommend how to safely remove the old packages before installing the
new ones.
2008-02-18 12:03:39 -07:00
kent@kent-amd64.(none)
6761108f29
Merge mysql.com:/home/kent/bk/maria/mysql-maria-gca
...
into mysql.com:/home/kent/bk/build/mysql-5.1-build
2008-02-18 16:23:00 +01:00
kent@mysql.com/kent-amd64.(none)
5d3d61f459
CMakeLists.txt:
...
Missing "sql_profile.cc" was added
2008-02-18 14:46:47 +01:00
pcrews@pcrews-mac-local.local
0a62b5584c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/34468/mysql-5.1-build-34468
2008-02-14 11:54:56 -05:00
pcrews@pcrews-mac-local.local
dd71e64ae7
Bug#34468 - csv_not_null fails
...
Altered test to expect error on UPDATE SET <not_null_col> = NULL instead
of expecting warning and re-recorded .result file.
2008-02-14 08:17:47 -05:00
tsmith@ramayana.hindu.god
cd6e2ad99f
Bug #21158 mysql_config doesn't include -lmygcc
...
Add -lmygcc to mysql_config output for libs, libs_r, and embedded_libs.
Required when linking against our static libs, if yassl is used, and gcc
used to build library is significantly different from that which is using
the library.
2008-02-14 01:05:25 -07:00
joerg@trift2.
cc72fa880e
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2008-02-13 17:08:48 +01:00
joerg@trift2.
480a15dc44
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into trift2.:/MySQL/M51/push-5.1
2008-02-13 16:58:37 +01:00
joerg@trift2.
89d5b47c6e
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into trift2.:/MySQL/M50/push-5.0
2008-02-13 16:55:22 +01:00
df@pippilotta.erinye.com
c78d616938
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2008-02-13 14:44:56 +01:00
joerg@trift2.
9337cfbb39
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2008-02-13 13:49:49 +01:00
joerg@trift2.
51f81b0209
Merge trift2.:/MySQL/M51/clone-5.1
...
into trift2.:/MySQL/M51/push-5.1
2008-02-13 13:40:53 +01:00
joerg@trift2.
341258dba4
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2008-02-13 13:05:07 +01:00
joerg@trift2.
d500b8650d
Merge trift2.:/MySQL/M50/clone-5.0
...
into trift2.:/MySQL/M50/push-5.0
2008-02-13 12:58:10 +01:00
joerg@trift2.
e31275c481
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2008-02-13 12:48:25 +01:00
kent@mysql.com/kent-amd64.(none)
a5edb90edf
ha_ndbcluster.m4:
...
If the third number in version is followed by a letter, include it
in NDB_VERSION_STATUS, but not in numeric NDB_VERSION_BUILD
2008-02-12 19:08:04 +01:00
df@pippilotta.erinye.com
72073063cb
Make this build on Windows.
2008-02-11 18:02:37 +01:00
anozdrin/alik@quad.
301ab0d8b7
Disable sporadically failing test cases (Bug#34454).
2008-02-11 14:34:53 +03:00
anozdrin/alik@quad.
524cbe2e4c
Disabling declaration of debug variable for non-debug builds.
...
(originally from Mats)
2008-02-11 14:05:27 +03:00
anozdrin/alik@quad.
a52a30e3e6
Patch to eliminate some valgrind warnings in debug printout code.
...
(originally from Mats)
2008-02-11 14:04:30 +03:00
kostja@dipika.(none)
b09af4bef4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-09 14:42:26 +03:00
kostja@dipika.(none)
84713274ba
Fix a buffer overflow with strmake().
2008-02-09 10:31:22 +03:00
malff@lambda.hsd1.co.comcast.net.
20e33c30a0
Fixed buffer overflow
2008-02-08 19:37:57 -07:00
anozdrin/alik@quad.
dbe77333d5
Bug#34424: query_cache_debug.test leads to valgrind warnings
...
Disable the test case.
2008-02-08 20:07:39 +03:00
anozdrin/alik@quad.
fab537bc89
Fix create.test: use latin1 instead ucs2.
2008-02-08 20:06:05 +03:00
kostja@dipika.(none)
add76ef5d5
Fix -ansi -pedantic compilation error
2008-02-08 19:33:24 +03:00
kostja@dipika.(none)
ef36b32ef0
Merge dipika.(none):/opt/local/work/mysql-5.0-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-08 19:01:57 +03:00
kostja@dipika.(none)
e9c887cc3d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-08 18:55:07 +03:00
kostja@dipika.(none)
0e4b6ea058
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dipika.(none):/opt/local/work/mysql-5.0-runtime
2008-02-08 18:51:07 +03:00
kostja@dipika.(none)
d956281e1e
Don't complain about a failure to write a log message if we were
...
simply killed.
2008-02-08 17:25:20 +03:00