mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-06 11:13:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34954 commits 2860 branches 349 tags 1.6 GiB
Commit graph

34954 commits

Author SHA1 Message Date
cmiller@zippy.(none)
8e2aee1c01 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
 2006-06-13 15:33:17 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
59c0034061 BUG#19307: CSV engine can cause crashes in partitioned tables (due to its conversion of NULLs to 0) 2006-06-13 14:36:23 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
d2b04770ac Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
 2006-06-13 11:44:43 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
c2f0bd70b5 fixed test case 2006-06-13 11:32:07 -04:00
mskold@mysql.com
95d61f64d8 Fixed incorrect handling of renamed fields, forcing copy of table if needed and added optional system variable ndb_use_copying_alter_table 2006-06-13 16:44:30 +02:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
192033c7a2 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
 2006-06-12 17:49:38 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
44076b96a1 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122
 2006-06-12 17:41:05 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
92dec44ef9 BUG#19122: Need to close handlers before drop/rename phase 
Fixed comments
 2006-06-12 17:37:32 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
30817b8900 BUG#19122: Need to close all handlers before rename/drop phase in ALTER TABLE ADD/DROP/REORGANIZE partitions 
After review fix
 2006-06-12 17:30:32 -04:00
pekka@orca.ndb.mysql.com
0685030416 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51
 2006-06-12 22:09:48 +02:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
334a28f9f5 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19695 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
 2006-06-12 14:50:46 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
744bb5d7bb Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19695
 2006-06-12 14:42:07 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
9aa3af6723 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
 2006-06-12 14:31:25 -04:00
pekka@clam.ndb.mysql.com
800e1e56a9 ndb - bug#19872 fix (sufficient for replication) 2006-06-12 18:00:06 +02:00
acurtis@xiphis.org
32fbbbb9b6 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  xiphis.org:/home/antony/work2/p2-bug20168.2
 2006-06-12 06:53:31 -07:00
acurtis@xiphis.org
62729fcdfe Bug#20168 
"Change in behavior --default-storage-engine=ndb or ndbcluster"
  Reduce use of legacy_db_type, some code cleanup
  (serg read my mind and implemented desired mysqld.cc changes)
 2006-06-12 06:50:11 -07:00
mskold@mysql.com
ae70201afb Added order by 2006-06-12 15:28:36 +02:00
mskold@linux.site
40e6161fdd Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-06-12 14:36:06 +02:00
mskold@mysql.com
38a445fee1 sql_delete.cc: 
Bug   TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: locked lock_OPEN mutex to support TRUNCATE with re-create and cluster binlog
Many files:
  Bug   TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
ndb_lock.result, ha_ndbcluster.cc:
  Fix for Bug   SELECT ... FOR UPDATE does not work..: Adaption to 5.1 code
NdbDictionaryImpl.hpp:
  Fix of bad merge
 2006-06-12 14:23:21 +02:00
tomas@poseidon.ndb.mysql.com
faa2f09107 Merge jonas@perch:src/51-jonas 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-12 13:46:10 +02:00
tomas@poseidon.ndb.mysql.com
cd90b5d777 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-12 13:29:33 +02:00
tomas@poseidon.ndb.mysql.com
cb3a75a4ee Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-12 13:12:03 +02:00
tomas@poseidon.ndb.mysql.com
ccd0b3e3ca Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-06-12 13:08:04 +02:00
tomas@poseidon.ndb.mysql.com
697db8f043 Bug CLUSTERLOG commands have no effect 
- always calculate max log level on node start
- send event subscribe uncond
 2006-06-12 13:06:56 +02:00
mskold@mysql.com
be60898441 Merge mysql.com:/home/marty/MySQL/mysql-5.0 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-06-12 11:34:00 +02:00
mskold@mysql.com
d17c3d3c7c Fix for Bug SELECT ... FOR UPDATE does not work..: Skipped lock check for full table scan due to bug SELECT FOR UPDATE does not release locks of untouched rows in full table scans 2006-06-12 10:40:56 +02:00
mskold@mysql.com
58f686f985 Fix for Bug SELECT ... FOR UPDATE does not work..: Added missing parameter for readTuples in index scan 2006-06-12 10:22:32 +02:00
mskold@mysql.com
b93ba41e68 Merge mysql.com:/home/marty/MySQL/mysql-4.1 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-06-12 09:42:20 +02:00
mskold@mysql.com
e7c1a57f3d Fix for Bug SELECT ... FOR UPDATE does not work..: Adapted to 5.0 code changes 2006-06-12 09:37:19 +02:00
mskold@mysql.com
b89f17912c Added lock test on index scan 2006-06-12 09:28:27 +02:00
mskold@mysql.com
030f63fdab Moved back comment to correct method 2006-06-12 09:27:04 +02:00
pekka@clam.ndb.mysql.com
ada3df7026 ndb - bug#18781 (5.0) handle rolling upgrade, minor fixes, logging, docs 2006-06-11 20:46:47 +02:00
ingo@chilla.local
a94ad6a2e3 Merge mysql.com:/home/mydev/mysql-5.1--main 
into  mysql.com:/home/mydev/mysql-5.1-amerge
 2006-06-10 06:15:26 +02:00
igor@rurik.mysql.com
bcc898f71b Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-06-09 15:39:10 -07:00
konstantin@mysql.com
5579fc230d Disable im_life_cycle test 2006-06-10 00:35:44 +04:00
igor@rurik.mysql.com
3d6899948b Merge rurik.mysql.com:/home/igor/mysql-5.1 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-06-09 12:31:15 -07:00
igor@rurik.mysql.com
e6e4462d68 Post-merge fixes 2006-06-09 12:27:28 -07:00
sergefp@mysql.com
a0676542a7 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1 
into mysql.com:/home/psergey/mysql-5.1-bug19684
 2006-06-09 20:38:53 +04:00
ingo@chilla.local
091401e7a8 Merge mysql.com:/home/mydev/mysql-5.1--main 
into  mysql.com:/home/mydev/mysql-5.1-amerge
 2006-06-09 18:20:10 +02:00
ingo@chilla.local
f991b573c5 Merge mysql.com:/home/mydev/mysql-5.1--main 
into  mysql.com:/home/mydev/mysql-5.1-amerge
 2006-06-09 17:32:23 +02:00
holyfoot@mysql.com
c2df72d6cb Merge 2006-06-09 19:09:42 +05:00
joerg@trift2.
7987ef89fd Merge mysql.com:/M51/bug20303-5.1 into mysql.com:/M51/mysql-5.1 2006-06-09 13:56:29 +02:00
ingo@mysql.com
0ae24af51b Merge mysql.com:/home/mydev/mysql-5.1--main 
into  mysql.com:/home/mydev/mysql-5.1-amerge
 2006-06-09 13:51:41 +02:00
joerg@mysql.com
98b80d12cd Merge mysql.com:/M50/bug20303-5.0 into mysql.com:/M51/bug20303-5.1 2006-06-09 13:49:10 +02:00
tomas@poseidon.ndb.mysql.com
6e68423db6 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-09 12:40:10 +02:00
tomas@poseidon.ndb.mysql.com
5af1d8de07 Bug Online adding of MySQLD causes cluster to crash 
- check node type, if configuration has not bee updated, type will be undefined, and conenction will be refused
 2006-06-09 12:30:04 +02:00
jonas@perch.ndb.mysql.com
246d76f154 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-jonas 
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
 2006-06-09 12:17:00 +02:00
mskold@mysql.com
22fea185bd Merge mysql.com:/home/marty/MySQL/mysql-4.1 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-06-09 12:07:04 +02:00
jonas@mc01.ndb.mysql.com
4a8dbd3f7b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-jonas 
into mc01.ndb.mysql.com:/space/jonas/mysql-5.1-jonas
 2006-06-09 11:40:38 +02:00
jonas@mc01.ndb.mysql.com
9064f067e8 ndb - fix 5.1 scan error handling problem 
Make sure that error gets set corretly also
    when error code directly after taking mutex
 2006-06-09 11:39:27 +02:00