mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
38332 commits 2788 branches 343 tags 1.7 GiB
Commit graph

38332 commits

This branch
This branch
All branches
Author SHA1 Message Date
svoj@april.(none)
c2f1876816 Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.1-engines
 2006-10-06 14:55:57 +05:00
svoj@mysql.com/april.(none)
60ba9f2b63 Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines
 2006-10-06 14:49:21 +05:00
svoj@mysql.com/april.(none)
6a1a765b5d Per discussion with pekka removed non-deterministic test case for bug#21381. 2006-10-06 14:47:58 +05:00
svoj@mysql.com/april.(none)
dad1283cc8 Addition to fix for bug#10974. Fixed spelling. 2006-10-06 11:11:47 +05:00
svoj@april.(none)
ad85dccae4 Merge mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.1-engines
 2006-10-06 11:09:58 +05:00
svoj@mysql.com/april.(none)
ee4080f9f9 Addition to fix for bug#10974. Fixed spelling. 2006-10-06 11:03:14 +05:00
svoj@mysql.com/april.(none)
94040c54b3 Merge mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.0-engines
 2006-10-06 11:01:39 +05:00
svoj@mysql.com/april.(none)
c67aa031d6 Addition to fix for bug#10974. Fixed spelling. 2006-10-06 10:54:47 +05:00
svoj@mysql.com/april.(none)
5d096b89f2 After merge fix. 2006-10-06 00:22:41 +05:00
svoj@april.(none)
77cb275b70 Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.1-engines
 2006-10-05 21:15:12 +05:00
svoj@mysql.com/april.(none)
d41340516f Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines
 2006-10-05 19:02:29 +05:00
svoj@mysql.com/april.(none)
16c13a588f Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines
 2006-10-05 18:56:10 +05:00
svoj@mysql.com/april.(none)
b141a7c1b9 BUG#21381 - Engine not notified about multi-table UPDATE IGNORE 
Though this is not storage engine specific problem, I was able to
repeat this problem with BDB and NDB engines only. That was the
reason to add a test case into ndb_update.test. As a result
different bad things could happen.

BDB has removed duplicate rows which is not expected.
NDB returns an error.

For multi table update notify storage engine about UPDATE IGNORE
as it is done in single table UPDATE.
 2006-10-05 18:23:53 +05:00
acurtis/antony@ltamd64.xiphis.org
52326aba48 Merge xiphis.org:/home/antony/work2/p2-bug22080.2 
into  xiphis.org:/home/antony/work2/p2-bug22080.3
 2006-10-03 16:51:19 -07:00
svoj@mysql.com/april.(none)
d9e92fbd9e BUG#22924 - windows test fails with wrong errno 
Fixed a test case according to fix for bug10974.
 2006-10-03 16:50:15 +05:00
svoj@april.(none)
9ace1cc45d Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-10-02 15:12:11 +05:00
svoj@april.(none)
115c4fe8dc Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-10-02 15:11:08 +05:00
svoj@mysql.com/april.(none)
25ef3a6ee1 Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2006-10-02 14:53:03 +05:00
svoj@mysql.com/april.(none)
361c46eefe Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2006-10-02 14:52:09 +05:00
svoj@mysql.com/april.(none)
5f3cf1eca3 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
 2006-10-02 14:46:10 +05:00
svoj@mysql.com/april.(none)
7afbe5f86e Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
 2006-10-02 14:42:12 +05:00
baker@bk-internal.mysql.com
8a5fef1419 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-10-01 22:31:04 +02:00
brian@zim.(none)
8685747f06 This patch makes ndbcluster_hton not static. I have a second patch for ndbcluster_hton to be static, but I want to talk to Jonas first. 2006-10-01 11:17:59 -07:00
brian@zim.(none)
8096f1c4b2 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-30 19:12:50 -07:00
brian@zim.(none)
fc0fa8da3f Merge fix. 2006-09-30 19:08:13 -07:00
brian@zim.(none)
4117860ec6 Merge zim.(none):/home/brian/mysql/merge-5.1 
into  zim.(none):/home/brian/mysql/arch-5.1
 2006-09-30 18:44:42 -07:00
brian@zim.(none)
56505c01f9 This patch updates to remove most global hton needs. Cleans up wrong message in partition. 2006-09-30 18:31:13 -07:00
brian@zim.(none)
46ae2113ba This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch). 
Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call.
 2006-09-30 12:49:46 -07:00
gkodinov@dl145s.mysql.com
869d1a6a1d Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-09-30 09:35:11 +02:00
brian@zim.(none)
a756fd36ef This removes the passing of global hton to engine instance. 2006-09-29 17:19:02 -07:00
istruewing@chilla.local
c2d73af1b2 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into  chilla.local:/home/mydev/mysql-4.0-bug20719
 2006-09-29 19:55:09 +02:00
istruewing@chilla.local
c672a7710d Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  chilla.local:/home/mydev/mysql-5.0-bug20627
 2006-09-29 19:17:03 +02:00
svoj@april.(none)
f7209c8082 Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines
 2006-09-29 21:47:14 +05:00
sergefp@mysql.com
cd094b71af BUG#14940: Update test results 2006-09-29 20:42:37 +04:00
svoj@mysql.com/april.(none)
a2c427395c Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
 2006-09-29 21:42:29 +05:00
svoj@mysql.com/april.(none)
deaf470839 Fixed that max_zfile_size was incorrectly calculated on big-endian boxes. 
Was introduced with patch for bug#21675.
 2006-09-29 21:36:17 +05:00
baker@bk-internal.mysql.com
802292ae37 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-09-29 18:23:11 +02:00
istruewing@chilla.local
fe7de5b96c Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  chilla.local:/home/mydev/mysql-5.0-bug20627
 2006-09-29 17:59:56 +02:00
istruewing@chilla.local
5ad8f1c464 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-bug22384
 2006-09-29 17:17:01 +02:00
sergefp@pylon.mylan
16506e906b Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/psergey/mysql-5.1-bug14940-r10a
 2006-09-29 18:35:03 +04:00
sergefp@mysql.com
e37d6ca7cd Remove empty line 2006-09-29 18:26:57 +04:00
svoj@mysql.com/april.(none)
b6684e6f84 Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
 2006-09-29 19:04:41 +05:00
svoj@mysql.com/april.(none)
0297046a10 Fix a test case according to fix for bug#10974. 2006-09-29 19:00:52 +05:00
istruewing@chilla.local
ec86974a51 Merge chilla.local:/home/mydev/mysql-5.1--team 
into  chilla.local:/home/mydev/mysql-5.1-bug20627
 2006-09-29 15:58:15 +02:00
istruewing@chilla.local
23f9362026 Merge chilla.local:/home/mydev/mysql-5.0--team 
into  chilla.local:/home/mydev/mysql-5.0-bug22384
 2006-09-29 15:28:38 +02:00
gkodinov@dl145s.mysql.com
8da0a672af merge fixes 2006-09-29 15:10:20 +02:00
sergefp@mysql.com
47b357522a BUG#14940: Slow join order is chosen: [2nd commit with post-review fixes] 
- Re-worked the prev_record_reads() function to return the lower bound of
  number of different table access scans that will be performed.
 2006-09-29 15:58:47 +04:00
istruewing@chilla.local
8148bf497a Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID 
Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
Merge from 5.0.
Changed auto_increment handling to the 5.1 pattern.
 2006-09-29 13:23:33 +02:00
gkodinov@dl145s.mysql.com
0012fb3ed6 Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-09-29 11:30:35 +02:00
gkodinov@dl145s.mysql.com
0293b69ac7 Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-09-29 11:21:40 +02:00