database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Code Activity
38,069 Commits 3,280 Branches 1,098 Tags
fe0cfacf35514b6a271d5be99e16ca18bea08715
Commit Graph

13917 Commits

Author SHA1 Message Date
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
006176ba1f Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19067
 2006-04-20 14:21:05 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
a3f152cc6e Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962
 2006-04-20 14:16:27 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
14d8f0c3cd Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19067
 2006-04-20 14:13:49 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
570c74e456 BUG#19067: Alter table add partition for subpartitioned table crashes 
Changed variable name for improved clarity and debugging possibilities
Fixed bug in not assigning subpart_type
 2006-04-20 14:11:54 -04:00
mleich@mysql.com
4cbad914ca Post merge correction for the Changesset 
Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to MySQL 4.1
and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)
 2006-04-20 19:43:02 +02:00
pekka@mysql.com
a272f257c2 ndb/repl - bug#19004 rpl_ndb_2myisam ok, rpl_ndb_2innodb new bug(number)19227 2006-04-20 18:53:23 +02:00
konstantin@mysql.com
f14040e4d8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/opt/local/work/mysql-5.1-merge
 2006-04-20 20:49:41 +04:00
igor@rurik.mysql.com
18149be57c Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-20 07:24:34 -07:00
pem@mysql.com
2dc3026c08 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug18949/mysql-5.0-runtime
 2006-04-20 16:00:33 +02:00
tomas@poseidon.ndb.mysql.com
6be87a41a2 added missing cleanup in test causing later test to fail 2006-04-20 15:28:31 +02:00
mleich@mysql.com
26b9d40309 Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src 
into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
 2006-04-20 15:25:28 +02:00
tomas@poseidon.ndb.mysql.com
271d7178e3 add mysql test run (from shell script) option to skip binlogs 2006-04-20 14:43:06 +02:00
mskold@mysql.com
fdd6d3ca8c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2006-04-20 13:35:34 +02:00
mskold@mysql.com
ed31665b2a Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code: updated with new expected error codes 2006-04-20 13:32:41 +02:00
mleich@mysql.com
e8178cabb1 Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src 
into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
 2006-04-20 12:35:10 +02:00
bar@mysql.com
093792c6c2 Bug#9509: Optimizer: wrong result after AND with latin1_german2_ci comparisons 
Fixing part2 of this problem: AND didn't work well 
with utf8_czech_ci and utf8_lithianian_ci in some cases.

The problem was because when during condition optimization
field was replaced with a constant, the constant's collation
and collation derivation was used later for comparison instead
of the field collation and derivation, which led to non-equal
new condition in some cases.

This patch copies collation and derivation from the field being removed
to the new constant, which makes comparison work using the same collation
with the one which would be used if no condition optimization were done.

In other words:

  where s1 < 'K' and s1 = 'Y';

was rewritten to:

  where 'Y' < 'K' and s1 = 'Y';

Now it's rewritten to:

  where 'Y' collate collation_of_s1 < 'K' and s1 = 'Y'

  (using derivation of s1)


Note, the first problem of this bug (with latin1_german2_ci) was fixed
earlier in 5.0 tree, in a separate changeset.
 2006-04-20 15:09:01 +05:00
mskold@mysql.com
22d345bf5b Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code 2006-04-20 12:06:22 +02:00
tomas@poseidon.ndb.mysql.com
5cec74c8de Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-20 12:06:14 +02:00
evgen@moonbone.local
e347ec5cbe func_gconcat.result, func_gconcat.test: 
Remove duplicate test case for bug#14169
 2006-04-20 13:34:14 +04:00
mleich@production.mysql.com
5109b3ce02 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  production.mysql.com:/usersnfs/mleich/src
 2006-04-20 11:31:22 +02:00
mskold@mysql.com
15ca6daf6f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-20 11:11:21 +02:00
evgen@moonbone.local
4b04ce8085 func_gconcat.test: 
Clean up test case for bug#14169
 2006-04-20 12:35:33 +04:00
igor@rurik.mysql.com
692da27388 Post merge fix 2006-04-20 00:42:12 -07:00
mats@mysql.com
cb48b8ccb3 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b17400-mysql-5.1-new
 2006-04-20 09:00:49 +02:00
mats@mysql.com
4b605314e3 Bug#16993 (ALTER TABLE ADD col AUTO_INCREMENT does not replicate): 
Removed rpl_ndb_relay_space test since it does not make sense (in
its current form) for NDB.
 2006-04-20 08:56:47 +02:00
igor@rurik.mysql.com
7b0373a557 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-19 18:27:18 -07:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
09e95da616 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
 2006-04-19 21:22:35 -04:00
igor@rurik.mysql.com
27cc6f4bc3 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-2 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-19 18:08:15 -07:00
igor@rurik.mysql.com
67458961cf Temporarily commented out a query from the test case for bug 14169 to make it pass with --ps-protocol. 2006-04-19 16:08:37 -07:00
tomas@poseidon.ndb.mysql.com
1d3d32412f cluster: letting first mysql server startup properly before tstarting next 2006-04-19 23:50:51 +02:00
tomas@poseidon.ndb.mysql.com
697227c898 BUG#17400 enabled rpl_ndb_dd_partitions 2006-04-19 23:46:40 +02:00
igor@rurik.mysql.com
881b55d503 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-2
 2006-04-19 14:42:51 -07:00
jimw@mysql.com
b57eb9e17c Merge mysql.com:/home/jimw/my/mysql-5.0-17043 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-19 14:18:35 -07:00
jimw@mysql.com
aabf1120a3 Turn on test timing in mysql-test-run.pl by default, and clean up usage docs. 2006-04-19 14:09:49 -07:00
tomas@poseidon.ndb.mysql.com
9d5429a3d0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-19 22:46:01 +02:00
evgen@moonbone.local
8b4eae6e4f func_gconcat.result: 
Corrected test case for the bug#14169 to make it pass in --ps-protocol mode.
 2006-04-20 00:27:43 +04:00
tomas@poseidon.ndb.mysql.com
65cee73399 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-19 19:56:52 +02:00
mats@mysql.com
5f763b4378 Disabling test that fails. There is already a bug for the failure. 2006-04-19 19:53:17 +02:00
igor@rurik.mysql.com
a6be98b8a8 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-19 10:45:06 -07:00
konstantin@mysql.com
6d277eb89d Merge mysql.com:/opt/local/work/tmp_merge 
into  mysql.com:/opt/local/work/mysql-5.1-merge
 2006-04-19 21:12:24 +04:00
dlenev@mysql.com
19e558a09d Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/dlenev/mysql-5.0-bg16021
 2006-04-19 19:35:32 +04:00
dlenev@mysql.com
b128fa1022 Added test case for bug #16021 "Wrong index given to function in trigger" 
which was caused by the same bulk insert optimization as bug #17764 but
had slightly different symptoms.
 2006-04-19 19:13:03 +04:00
msvensson@neptunus.(none)
d7faf15ce5 Bug#19190 syntax error in mysql-test/mysql-test-run.sh script 2006-04-19 16:23:35 +02:00
mats@mysql.com
eee166d859 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b17400-mysql-5.1-new
 2006-04-19 15:33:31 +02:00
mats@mysql.com
97f9cf23a8 Bug#16993 (ALTER TABLE ZEROFILL AUTO_INCREMENT not replicated correctly): 
This is not a bug. Enabling disabled test and adding comment.
 2006-04-19 15:29:49 +02:00
tomas@poseidon.ndb.mysql.com
0ebba697d8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-19 14:58:42 +02:00
tomas@poseidon.ndb.mysql.com
928514cf80 BUG#18094 Slave caches invalid table definition after atlters causes select failure 
- return correct object status from ndb dictionary
- check for validity of index retrieved from index, and retry if invalid
 2006-04-19 14:54:39 +02:00
msvensson@neptunus.(none)
ba658599e7 Merge neptunus.(none):/home/msvensson/mysql/bug18564/my50-bug18564 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-04-19 13:56:09 +02:00
kroki@mysql.com
c51fb60b0b Bug#6951: Triggers/Traditional: SET @ result wrong 
While executing a trigger, we have to set thd->abort_on_warning to the value
it had at trigger creation time.
 2006-04-19 14:27:59 +04:00
svoj@april.(none)
06ce215f10 BUG#18160 - Memory-/HEAP Table endless growing indexes 
Updating data in HEAP table with BTREE index results in wrong index_length
counter value, which keeps growing after each update.

When inserting new record into tree counter is incremented by:
sizeof(TREE_ELEMENT) + key_size + tree->size_of_element
But when deleting element from tree it doesn't decrement counter by key_size:
sizeof(TREE_ELEMENT) + tree->size_of_element

This fix makes accurate allocated memory counter for tree. That is
decrease counter by key_size when deleting tree element.
 2006-04-19 15:13:50 +05:00