msvensson@pilot.mysql.com
06cf8665c5
Fix after merge
2008-02-28 18:55:46 +01:00
msvensson@pilot.mysql.com
56a354794c
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
2008-02-28 12:21:44 +01:00
msvensson@pilot.mysql.com
0462076eac
Add variables fro myisamchk and myisampack
2008-02-28 11:49:14 +01:00
msvensson@pilot.mysql.com
a0dd86232c
Use car/tmp as tempdir for mysqld --bootstrap
...
Run "mysql --bootstrap" with verbose if turned on
2008-02-28 10:52:04 +01:00
msvensson@pilot.mysql.com
ae3f30828b
Merge bk-internal:/home/bk/mysql-5.1-rpl
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
2008-02-28 10:39:29 +01:00
sven@riska.(none)
4aab65ad5c
Fix pushbuild errors.
2008-02-27 15:18:27 +01:00
mkindahl@dl145h.mysql.com
0b6471da9c
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-27 11:00:43 +01:00
msvensson@pilot.mysql.com
8d6d318c6b
Only uise one file for current test
...
Don't retry by default
Fixes for --embedded
2008-02-25 16:41:59 +01:00
tsmith@ramayana.hindu.god
56719ad7f4
Bug #34053 : normal users can enable innodb_monitor logging
...
The check_global_access() function was made available to InnoDB, but
was not defined in the embedded server library. InnoDB, as a plugin,
is not recompiled when the embedded server is built. This caused a
link failure when compiling applications which use the embedded server.
The fix here is to always define check_global_access() externally; in
the embedded server case, it is defined to just return OK.
Also, don't run the test case for this bug in embedded server.
2008-02-22 16:56:34 -07:00
hhunger@hh-nb.hungers
5d16b95b78
Merge bk-internal:/home/bk/mysql-5.1-build
...
into hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
2008-02-22 22:14:34 +01:00
hhunger@hh-nb.hungers
26ede4b6a7
Inserted changes from the review of bug#32664.
2008-02-22 21:28:59 +01:00
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
joerg@trift2.
260081267d
mysql-test/mysql-test-run.pl
...
Disable extra team trees.
Temporary fix for entry 34761 in the bugs DB.
(Patch by Magnus Svensson, 2008-02-22 17:40:14+01:00, msvensson@pilot.mysql.com +1 -0)
2008-02-22 19:15:31 +01:00
joerg@trift2.
25ab6afc03
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2008-02-22 16:14:27 +01:00
msvensson@pilot.mysql.com
0b547b26db
Fix embedded server
2008-02-22 15:38:10 +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
de4f78d919
Remove special hack for windows, log-error is already set in my.cnf file
2008-02-22 12:32:02 +01:00
msvensson@pilot.mysql.com
3dc9779480
Convert to mixed_path under cywin, not native_path
2008-02-22 12:23:46 +01:00
msvensson@pilot.mysql.com
457283d5ab
Merge bk-internal:/home/bk/mysql-5.1-rpl
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
2008-02-22 11:44:31 +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
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
mkindahl@dl145h.mysql.com
924ff2621e
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-21 09:04:25 +01:00
mkindahl@dl145h.mysql.com
802158bda5
Fixing result after merge.
2008-02-21 06:29:35 +01:00
aelkin/andrei@mysql1000.(none)
49915eb88a
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into mysql1000.(none):/home/andrei/MySQL/FIXES/5.1/bug31316-sss_server_id_clashes
2008-02-20 23:25:01 +02:00
aelkin/andrei@mysql1000.(none)
7e93d94ce5
Bug #31316 Report server id clashes in SHOW SLAVE STATUS
...
"Server_IO_State" field
Critical error messages from get_master_version_and_clock() were written
only to the slave errorlog while Show slave status did not display any
incident happened.
Although the artifact was reported for a particular --replicate-same-server-id
related issue the fix refines all critical error reporting with
deploying rli->report().
The test for the bug covers only --replicate-same-server-id error reporting.
2008-02-20 23:18:01 +02:00
mkindahl@dl145h.mysql.com
759d2f6658
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-20 19:49:26 +01:00
mkindahl@dl145h.mysql.com
a71f298f2a
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-20 19:27:06 +01:00
mkindahl@dl145h.mysql.com
06375e2130
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
2008-02-20 19:25:18 +01:00
msvensson@pilot.mysql.com
bf65a61567
Use My::Platform
...
Put all path conversions in one file
Convert the --tmpdir passed to "mysqld --verbose --help"
2008-02-20 14:55:30 +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
bar@bar.myoffice.izhnet.ru
d5011e8561
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b32510
...
into mysql.com:/home/bar/mysql-work/mysql-5.0.b32510v2
2008-02-20 14:38:52 +04:00
msvensson@pilot.mysql.com
ec1f9b3305
Merge bk-internal:/home/bk/mysql-5.1-rpl
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
2008-02-20 08:42:03 +01:00
tomas@poseidon.bredbandsbolaget.se
50d95649f7
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-19 20:56:14 +01:00
mkindahl@dl145h.mysql.com
482997ea65
Removing deliberately generated errors for rpl_bug33931 test
...
and moving test to replication suite.
2008-02-19 19:59:48 +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
mkindahl@dl145h.mysql.com
e8e74a734f
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-19 14:47:29 +01:00
mkindahl@dl145h.mysql.com
446c3768f5
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-19 11:07:14 +01:00
sven@riska.(none)
4cf7508380
Fixed broken result file.
2008-02-18 15:48:17 +01:00
mkindahl@dl145h.mysql.com
896fceec81
Updating result files.
2008-02-18 15:16:39 +01:00
mkindahl@dl145h.mysql.com
d277f9344f
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
2008-02-15 17:51:35 +01:00
mkindahl@dl145h.mysql.com
c5273c1759
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-15 17:49:05 +01:00
sven@riska.(none)
b19d948e8a
Problem: After I moved rpl/t/rpl_variables.test into t/variables.test,
...
t/variables.test fails on embedded server. Moved out that part again, to
a new test called t/variables-notembedded.test.
2008-02-15 12:54:04 +00:00
bar@bar.myoffice.izhnet.ru
fd97a07758
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into mysql.com:/home/bar/mysql-work/mysql-5.1.b27877
2008-02-15 14:58:58 +04:00
mkindahl@dl145h.mysql.com
a1a94e238f
Adding waits to events_scheduling to prevent the test from
...
failing on heavily loaded systems.
2008-02-15 10:24:13 +01:00
aelkin/andrei@mysql1000.dsl.inet.fi
416001d8ed
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/5.0-bug33931-assert_write_ignored_ev_when_init_slave_fails
2008-02-14 21:38:30 +02: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
aelkin/andrei@mysql1000.dsl.inet.fi
871eb3e5ad
bug#33329 extraneous ROLLBACK in binlog on connection does not use trans tables
...
changes for an assert and an updated results file.
2008-02-14 16:28:32 +02: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
aelkin/andrei@mysql1000.dsl.inet.fi
f5fe34dcd1
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/5.0-bug33931-assert_write_ignored_ev_when_init_slave_fails
2008-02-14 13:55:11 +02:00
mkindahl@dl145h.mysql.com
fd5d7fa761
Fixing test rpl_events to not give false failures.
2008-02-14 10:53:12 +01:00