Commit graph

36389 commits

Author SHA1 Message Date
mkindahl@production.mysql.com[mkindahl]
794dba439e mytap-changes.patch 2006-08-25 13:53:16 +02:00
lars/lthalmann@dl145k.mysql.com
317bc36fd9 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-08-01 02:13:45 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
b3bc1d02de Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-08-01 02:10:30 +02:00
lars/lthalmann@dl145j.mysql.com
418d4eb39d Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-07-31 21:36:10 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
3fc037db1b Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-07-31 21:32:57 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
635281619b Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-07-31 21:30:24 +02:00
aivanov/alexi@mysql.com/mysqld.localdomain
8851926544 Make innodb_thread_concurrency 0 by default.
Fixing test result.
2006-07-30 05:16:08 +04:00
aivanov/alexi@mysql.com/mysqld.localdomain
0bd3c297a4 Make innodb_flush_log_at_trx_commit a settable global variable. 2006-07-29 07:17:33 +04:00
jimw@rama.(none)
69f9fe7531 Fix tests after merge and disable rpl_ndb_dd_advance due to bug 18679. 2006-07-28 19:39:34 -07:00
aivanov/alexi@mysql.com/mysqld.localdomain
7d3a584c03 Make innodb_thread_concurrency 0 by default, and extend
the usable range to 0..1000 (0 disables the thread throttling).
2006-07-29 03:56:23 +04:00
jimw@rama.(none)
f7e19b40f3 Merge rama.(none):/home/jimw/my/tmp_merge
into  rama.(none):/home/jimw/my/mysql-5.1-clean
2006-07-28 15:51:48 -07:00
kostja@bodhi.local
4bd7acec3f Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-07-28 18:02:38 +04:00
kostja@bodhi.local
131e3b0607 Add sql_locale.cc to cmake scripts. 2006-07-28 16:37:16 +04:00
aivanov/alexi@mysql.com/mysqld.localdomain
30c9ab1639 Removing temporary changes. 2006-07-28 09:05:08 +04:00
aivanov/alexi@mysql.com/mysqld.localdomain
221004a892 Removing temporary changes. 2006-07-28 05:34:59 +04:00
aivanov/alexi@mysql.com/mysqld.localdomain
17d1dba9ba Temporary changes just to check one point (will be restored) 2006-07-28 05:26:26 +04:00
aivanov/alexi@mysql.com/mysqld.localdomain
ef5acd5748 Temporary changes just to check some points (will be restored). 2006-07-28 03:32:39 +04:00
kostja@bodhi.local
024960aa2d Post-merge fixes. 2006-07-27 14:12:41 +04:00
msvensson@neptunus.(none)
fdfad1d063 Bug#21297 rpl_insert fails randomly
- Add loop in mysqlslap that tries to connect up to 10 times if connect
   in thread fails.
2006-07-27 10:54:04 +02:00
msvensson@neptunus.(none)
279dd5c73d Increase time to sleep to allow mysqlds to exit from readonly mode 2006-07-27 09:15:05 +02:00
msvensson@neptunus.(none)
705db761b9 Bug#21298 ndbcluster_log_schema_op locks already freed mutex
- Disable 3 test cases that crashes slave
2006-07-27 09:02:44 +02:00
msvensson@neptunus.(none)
e47f61a01c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-07-27 05:55:42 +02:00
kostja@bodhi.local
73189969f3 Merge bodhi.local:/opt/local/work/tmp_merge
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-07-26 23:33:25 +04:00
pekka@orca.ndb.mysql.com
4a1bf59e22 Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my51
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug14935
2006-07-26 20:40:20 +02:00
pekka@orca.ndb.mysql.com
a920df9c04 ndb - bug#14935 - post-review 2006-07-26 20:03:41 +02:00
kostja@bodhi.local
bea330494c Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-07-26 21:48:45 +04:00
msvensson@neptunus.(none)
f585407eb3 Add support for valgrind with callgrind 2006-07-26 14:44:59 +02:00
msvensson@neptunus.(none)
4632f97e21 Merge 192.168.0.20:mysql/my51-m-bug21039
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-07-26 14:29:09 +02:00
msvensson@neptunus.(none)
13aba17bf3 Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060721184912|58688 2006-07-26 14:27:52 +02:00
msvensson@neptunus.(none)
a69e5dcc04 Disable rpl_insert due to bug#21297 2006-07-26 14:27:05 +02:00
msvensson@shellback.(none)
a1ec4fe7f0 Bug#21039 Transaction cache not flushed after SELECT CREATE
- Add prelocking for stored procedures that uses sp or sf
 - Update test result for sp_error(reported as bug#21294)
 - Make note about new error message from sp-error(bug#17244)
2006-07-26 12:40:26 +02:00
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
ingo/mydev@chilla.local
598653ce99 Disabled ndb_restore_compat for BUG#21283. 2006-07-26 11:50:13 +02:00
aivanov/alexi@mysql.com/mysqld.localdomain
9f14faf7e7 Applied innodb-5.1-ss660 snapshot.
Changes in SQL parser:
 * Change default mode of SELECT from "lock in share mode"
   to "consistent read".
 * Remove support from SELECT for specifying "consistent read".
 * Add support in SELECT for specifying "lock in share mode".
 * Change all uses of SQL parser to specify "lock in share mode".
 * Modify syntax so that the only valid top-level statement is
   a procedure definition, since it's the only one that actually
   works.
 * Add support for lock waits.
2006-07-26 13:28:51 +04: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
aivanov@mysqld.localdomain
961b3f3447 Merge mysql.com:/home/alexi/innodb/mysql-5.0-work
into  mysql.com:/home/alexi/innodb/mysql-5.1-work
 Null merge.
2006-07-26 09:15:14 +04:00
aivanov@mysql.com
9441aa22ea Applied innodb-5.0-ss660 snapshot. 2006-07-26 08:26:07 +04:00
aivanov@mysql.com
e7548d2321 Merge mysql.com:/home/alexi/innodb/mysql-4.1-work
into  mysql.com:/home/alexi/innodb/mysql-5.0-work
  Null merge.
2006-07-26 07:54:25 +04:00
aivanov@mysql.com
765ed29c9a Applied innodb-4.1-ss32 snapshot. 2006-07-26 07:47:29 +04:00
ingo/mydev@chilla.local
15e6c15a40 Disabled ndb_binlog_ignore_db for BUG 21279. 2006-07-25 18:37:35 +02:00
andrey@lmy004.
0b875d0032 Fix for bug#16532 mysql server assert in debug if table definition is removed
Emit an error instead of doing ASSERT
2006-07-25 14:52:24 +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
ingo/mydev@chilla.local
5ebcd82a90 After merge fix 2006-07-24 13:34:30 +02:00
ingo/mydev@chilla.local
dcdd8612f4 After merge fix 2006-07-24 11:02:13 +02:00
ingo/mydev@chilla.local
cf708395e9 After merge fix 2006-07-24 10:53:26 +02:00
ingo/mydev@chilla.local
8bb8069653 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.1-amerge
2006-07-24 10:05:17 +02:00
stewart@willster.(none)
dbaba24c5b BUG#20294 Instance manager test im_instance_conf fails randomly
(well, im_options in this case, but using existing bug report)
2006-07-24 09:38:42 +10:00
stewart@willster.(none)
1496303771 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/main
into  willster.(none):/home/stewart/Documents/MySQL/5.1/main
2006-07-24 02:32:49 +10:00