msvensson@neptunus.(none)
46d63ab988
Change mtr_error to mtr_warning allowing processing to continue when mysqld fails to start
2006-07-26 12:21:34 +02:00
msvensson@neptunus.(none)
eb20bd4b78
Add printout of where error occured when printing to error log in 'im_stop'
2006-07-26 10:56:29 +02:00
msvensson@neptunus.(none)
0d177b2d85
Fix problem with detecting wheter im processes has shutdown cleanly
2006-07-26 10:35:08 +02:00
msvensson@neptunus.(none)
563a092f1f
Add the instance manager to the list of processes to shutdown and ping in mtr_kill_leftovers
2006-07-26 09:53:48 +02:00
msvensson@neptunus.(none)
420d40d345
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-07-25 08:49:26 +02:00
msvensson@neptunus.(none)
be1b24fec1
Bug#21039 Transaction cache not flushed after SELECT CREATE
...
- Disable test case until fixed
2006-07-21 20:49:12 +02:00
msvensson@neptunus.(none)
97dfae2e49
Loop wait with timeout until 5000 records are in table after mysqlslap with INSERT DELAYED
2006-07-21 12:39:06 +02:00
ingo/mydev@chilla.local
84f3623b3d
After merge fixes.
2006-07-21 10:43:10 +02:00
ingo/mydev@chilla.local
18a76a953c
Merge chilla.local:/home/mydev/mysql-5.0-mmerge
...
into chilla.local:/home/mydev/mysql-5.1-amain
2006-07-20 21:28:55 +02:00
msvensson@neptunus.(none)
0b786561ca
After ndbd nodes has been restarted the mysqld's will enter "read only" mode until they are fully connected again. Wait in a loop until
...
mysqld's has exited from that.
2006-07-20 20:14:13 +02:00
msvensson@neptunus.(none)
6cc8f5c0cd
Add small sleep after cluster restart to allow mysqld's to exit from readonly state
2006-07-20 10:59:55 +02:00
msvensson@neptunus.(none)
fe40a8cf9d
Merge bk-internal:/home/bk/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-07-19 08:57:52 +02:00
gluh@mysql.com/vva.(none)
7c0930c4ae
after merge fix
2006-07-18 20:13:13 +05:00
gluh@myoffice.izhnet.ru
f76aec6d90
Merge myoffice.izhnet.ru:/usr/home/gluh/MySQL/tmp_merge
...
into myoffice.izhnet.ru:/usr/home/gluh/MySQL/5.1
2006-07-18 18:43:55 +05:00
msvensson@neptunus.(none)
601d948099
Fix erroneous join function use
2006-07-18 15:15:43 +02:00
msvensson@neptunus.(none)
da214608b4
Add verbose printouts for im_start and im_stop
2006-07-18 14:53:50 +02:00
mikael/pappa@dator5.(none)
bae61f209d
Fixed test case
2006-07-17 06:53:46 -04:00
mikael/pappa@dator5.(none)
6019ac9b71
Fixes for strange appearance of db.opt file
2006-07-17 06:41:12 -04:00
mikael/pappa@dator5.(none)
3d44231064
Minor fix
2006-07-15 17:05:47 -04:00
mikael/pappa@dator5.(none)
1c1a131675
Remove files that tests leave behind
2006-07-15 12:01:46 -04:00
mikael/pappa@dator5.(none)
27b06d9dd0
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/push_tree_w28
2006-07-15 11:59:39 -04:00
mikael/pappa@dator5.(none)
cc545cc6cf
Fixes to make tests work in conjunction with other tests
2006-07-15 07:28:31 -04:00
mikael/pappa@dator5.(none)
30989a77a7
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/push_tree_w28
2006-07-15 04:06:31 -04:00
mikael/pappa@dator5.(none)
cacbb674b1
Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
...
into dator5.(none):/home/pappa/push_tree_w28
2006-07-15 03:59:53 -04:00
mikael/pappa@dator5.(none)
a6f310d0c2
Merge dator5.(none):/home/pappa/bug20852
...
into dator5.(none):/home/pappa/push_tree_w28
2006-07-15 03:49:01 -04:00
mikael/pappa@dator5.(none)
425c8883bb
Merge dator5.(none):/home/pappa/bug20770
...
into dator5.(none):/home/pappa/push_tree_w28
2006-07-15 03:46:01 -04:00
mikael/pappa@dator5.(none)
5a2edb5065
Merge dator5.(none):/home/pappa/bug20767
...
into dator5.(none):/home/pappa/push_tree_w28
2006-07-15 03:41:41 -04:00
mikael/pappa@dator5.(none)
cfc65ef720
BUG#20389: Crash when using index scan in reverse order
2006-07-15 03:38:34 -04:00
tsmith/tim@siva.hindu.god
6971ddee1a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into siva.hindu.god:/usr/home/tim/m/bk/merge-51
(which is mysql-5.1-new-maint team tree)
2006-07-15 00:33:24 -06:00
kostja@bodhi.local
231565c206
Fix information_schema.result after a manual merge.
2006-07-15 03:08:56 +04:00
kostja@bodhi.local
f536f361d9
Merge bodhi.local:/opt/local/work/tmp_merge
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
2006-07-15 01:04:51 +04:00
sergefp@pylon.mylan
2834bc1eae
Merge mysql.com:/home/psergey/tmp_merge-2
...
into mysql.com:/home/psergey/mysql-5.1-merge-2
2006-07-14 19:10:54 +04:00
kostja@bodhi.local
436e7a2dd9
Post-merge fixes.
2006-07-14 02:07:37 +04:00
kostja@bodhi.local
a38b418436
Post-merge fixes.
2006-07-13 17:34:49 +04:00
kostja@bodhi.local
99fefab169
Merge bodhi.local:/opt/local/work/tmp_merge
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
2006-07-13 11:43:52 +04:00
mikael/pappa@dator5.(none)
e9ba287dc7
BUG#20852: Using update with full table scan causes mysqld to enter an eternal loop
2006-07-12 20:38:17 -04:00
kostja@bodhi.local
56353959e7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-07-13 00:18:59 +04:00
mkindahl@dl145k.mysql.com
406d50db06
Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1
...
into dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.1-new-rpl
2006-07-12 10:07:07 +02:00
mkindahl@dl145k.mysql.com
f0537bc503
Post-merge fixes for mysql-5.1-new-rpl
2006-07-12 08:52:47 +02:00
mkindahl@dl145k.mysql.com
9415b24139
Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rpl
...
into dl145k.mysql.com:/data0/mkindahl/bk/MERGE/mysql-5.1-merge
2006-07-11 12:17:19 +02:00
ingo/mydev@chilla.local
f62b31c60e
Merge chilla.local:/home/mydev/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-amerge
2006-07-11 11:34:38 +02:00
cmiller@zippy.(none)
512d1c7ff3
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
2006-07-10 17:20:39 -04:00
mikael/pappa@dator5.(none)
65979719c7
BUG#20893: Valgrind error
2006-07-10 17:08:42 -04:00
cmiller@zippy.(none)
9be1c70404
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
2006-07-10 13:38:22 -04:00
guilhem@gbichot3.local
1cc3c80070
fixes after merge. Updates to test's results.
...
We now reset the THD members related to auto_increment+binlog in
MYSQL_LOG::write(). This is better than in THD::cleanup_after_query(),
which was not able to distinguish between SELECT myfunc1(),myfunc2()
and INSERT INTO t SELECT myfunc1(),myfunc2() from a binlogging point
of view.
Rows_log_event::exec_event() now calls lex_start() instead of
mysql_init_query() because the latter now does too much (it resets
the binlog format).
2006-07-10 18:41:03 +02:00
guilhem@gbichot3.local
93ce19dfb6
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into gbichot3.local:/home/mysql_src/mysql-5.1
2006-07-10 13:26:46 +02:00
mats@romeo.(none)
96fd6751cd
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/b20821-mysql-5.1-new-rpl
2006-07-10 12:54:24 +02:00
ingo/mydev@chilla.local
69bf342a20
Merge chilla.local:/home/mydev/mysql-5.1-amerge
...
into chilla.local:/home/mydev/mysql-5.1-aid
2006-07-10 12:41:07 +02:00
mats@romeo.(none)
7848edd065
Fixing problem where the command line for MYSQL_DUMP_SLAVE was not
...
set properly.
2006-07-10 12:06:30 +02:00
guilhem@gbichot3.local
bca3fc7800
Merge gbichot3.local:/home/mysql_src/mysql-5.1-interval-move-next-insert-id
...
into gbichot3.local:/home/mysql_src/mysql-5.1
2006-07-09 22:50:02 +02:00