mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36632 commits 2794 branches 343 tags 1.5 GiB
Commit graph

993 commits

Author SHA1 Message Date
brian@zim.(none)
e8289bfbc1 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
 2006-08-10 13:44:04 -07:00
brian@zim.(none)
c37e1b4839 First stage removeal of BDB. 2006-08-09 17:33:08 -07:00
kroki/tomash@moonlight.intranet
e79876362e Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-rt-merge
 2006-08-09 16:42:21 +04:00
petr/cps@owlet.
af461de728 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/devel/5.1-curs-bug
 2006-08-04 14:48:51 +04:00
jimw@rama.(none)
47f71efe0f Merge rama.(none):/home/jimw/my/mysql-5.1-17122 
into  rama.(none):/home/jimw/my/mysql-5.1-clean
 2006-08-03 11:12:48 -07:00
petr/cps@mysql.com/owlet.
be2ce2614b Fix Bug #18559 "log tables cannot change engine, and 
gets deadlocked when dropping w/ log on"

Log tables rely on concurrent insert machinery to add data.
This means that log tables are always opened and locked by
special (artificial) logger threads. Because of this, the thread
which tries to drop a log table starts to wait for the table
to be unlocked. Which will happen only if the log table is disabled.
Alike situation happens if one tries to alter a log table.
However in addition to the problem above, alter table calls
check_if_locking_is_allowed() routine for the engine. The
routine does not allow alter for the log tables. So, alter
doesn't start waiting forever for logs to be disabled, but 
returns with an error.
Another problem is that not all engines could be used for
the log tables. That's because they need concurrent insert.

In this patch we:
(1) Explicitly disallow to drop/alter a log table if it
    is currently used by the logger.
(2) Update MyISAM to support log tables
(3) Allow to drop log tables/alter log tables if log is
    disabled
At the same time we (4) Disallow to alter log tables to
unsupported engine (after this patch CSV and MyISAM are 
alowed)
Recommit with review fixes.
 2006-08-03 21:28:15 +04:00
evgen@sunlight.local
d6cf536d93 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-08-02 02:19:46 +04:00
evgen@sunlight.local
0cb98e4f4a Makefile.am: 
After merge fix
 2006-08-01 19:56:22 +04: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
evgen@sunlight.local
ef4f149536 Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-07-30 00:33:24 +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
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
024960aa2d Post-merge fixes. 2006-07-27 14:12:41 +04: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
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
ingo/mydev@chilla.local
cf708395e9 After merge fix 2006-07-24 10:53:26 +02: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
jimw@rama.(none)
a8223af945 Bug #17122: myisam_ftdump requires write access to files although only reads from them 
Instead of opening the table for read and write, myisam_ftdump is fixed to only
  open it for read.
 2006-07-21 13:59:59 -07:00
pekka@orca.ndb.mysql.com
15783e44d0 ndb - bug#14935 fix 2006-07-19 14:49:58 +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
pekka@orca.ndb.mysql.com
6da1b59c08 Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51
 2006-07-15 18:02:47 +02:00
pekka@orca.ndb.mysql.com
54571ec6ad ndb - ndb_restore: print some dd errors at right verbosity 2006-07-15 17:53:57 +02: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
d7845b74db Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
 2006-07-13 22:09:36 +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
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
pekka@orca.ndb.mysql.com
4163c91d8e ndb - debug stuff in LQH 2006-07-10 15:43:47 +02:00
pekka@orca.ndb.mysql.com
a3dcbff671 Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug18781
 2006-07-10 14:07:40 +02:00
pekka@orca.ndb.mysql.com
d525409ba3 Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug18781
 2006-07-10 13:54:26 +02:00
ingo/mydev@chilla.local
4cdb1469e0 Merge chilla.local:/home/mydev/mysql-5.1--main 
into  chilla.local:/home/mydev/mysql-5.1-amerge
 2006-07-08 10:54:54 +02:00
tomas@poseidon.ndb.mysql.com
5ab4800fc2 Bug #20897 race condition between drop table and suma drop trigger 
- keep accounting for aoutstanding drop trigger requests
- also lock table object in suma while doing that (should be impossible right now though since dict serializes all requests)
 2006-07-07 17:50:45 +02:00
ingo/mydev@chilla.local
49587d4b37 Merge chilla.local:/home/mydev/mysql-5.1--main 
into  chilla.local:/home/mydev/mysql-5.1-amerge
 2006-07-07 09:14:09 +02:00
ingo@chilla.local
1a98b89334 Merge chilla.local:/home/mydev/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-amerge
 2006-07-06 21:45:15 +02:00
tomas@poseidon.ndb.mysql.com
1db0b2c6a6 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-06 19:02:38 +02:00
ingo@chilla.local
db0e7774aa Merge chilla.local:/home/mydev/mysql-5.0-ateam 
into  chilla.local:/home/mydev/mysql-5.1-ateam
 2006-07-06 13:18:00 +02:00
jonas@perch.ndb.mysql.com
200deaa99e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-07-06 12:11:14 +02:00
tomas@poseidon.ndb.mysql.com
4d0d6cff98 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-06 12:11:13 +02:00
jonas@perch.ndb.mysql.com
88f816a0fd Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-07-06 09:40:04 +02:00
mskold@linux.site
0c5c9e174b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-07-06 09:08:39 +02:00
tomas@poseidon.ndb.mysql.com
55a9bab25e Bug #20843 tests fails randomly with assertion in completeClusterFailed 
- flush gci needs to be reset on disconnect as cluster may reconnect after --initial with a smaller gci
 2006-07-06 01:33:53 +02:00
cmiller@zippy.(none)
91b8b26411 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-05 16:16:09 -04:00
tomas@poseidon.ndb.mysql.com
f822477297 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-05 20:31:32 +02:00
tomas@poseidon.ndb.mysql.com
4f2becc9d3 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-05 20:23:23 +02:00
pekka@clam.ndb.mysql.com
38d63c303a ndb - ndb api : try to catch autoincr 'error 0' 2006-07-05 17:36:19 +02:00
mskold@linux.site
75a6a16a19 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-07-05 16:30:14 +02:00
mskold@mysql.com
7c650824dc Bug #19645 Data Node hangs in phase 100: post review fix, removed test printout 2006-07-05 15:32:17 +02:00
mskold@mysql.com
d951bc61ff Bug #19645 Data Node hangs in phase 100: distribute API_FAIL_REQ so all nodes have the same view of what API's are connected 2006-07-05 15:04:47 +02:00