database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-18 07:48:43 +03:00
Code Activity
32,014 Commits 3,279 Branches 1,097 Tags
f9075c07323f1625ed98307b3bd3fce4516d7bf7
Commit Graph

10914 Commits

Author SHA1 Message Date
mikael@zim.(none)
516ac72a75 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/mikael/bug16370
 2006-03-14 02:39:24 -08:00
mikael@zim.(none)
b829321dd0 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/mikael/bug17127
 2006-03-14 02:37:24 -08:00
mikael@zim.(none)
4b4b8f933e Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/mikael/bug17127
 2006-03-14 02:32:46 -08:00
mikael@zim.(none)
0ec5ee2c50 Manual merge 2006-03-14 01:39:27 -08:00
mikael@zim.(none)
ff77d7665d Merge zim.(none):/home/mikael/bug15961 
into  zim.(none):/home/mikael/bug16370
 2006-03-14 01:24:06 -08:00
mikael@zim.(none)
946979d2af Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/mikael/bug16370
 2006-03-14 01:07:29 -08:00
mikael@zim.(none)
a0f22844a7 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/mikael/bug15961
 2006-03-14 00:51:44 -08:00
gbichot@production.mysql.com
2c297c0753 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  production.mysql.com:/usersnfs/gbichot/mysql-5.1-new
 2006-03-14 09:00:45 +01:00
evgen@sunlight.local
af660df0ef Fixed bug#17366: Unchecked Item_int results in server crash 
When there is conjunction of conds, the substitute_for_best_equal_field()
will call the eliminate_item_equal() function in loop to build final
expression. But if eliminate_item_equal() finds that some cond will always
evaluate to 0, then that cond will be substituted by Item_int with value ==
0. In this case on the next iteration eliminate_item_equal() will get that 
Item_int and treat it as Item_cond. This is leads to memory corruption and
server crash on cleanup phase.

To the eliminate_item_equal() function was added DBUG_ASSERT for checking
that all items treaten as Item_cond are really Item_cond.
The substitute_for_best_equal_field() now checks that if
eliminate_item_equal() returns Item_int and it's value is 0 then this 
value is returned as the result of whole conjunction.
 2006-03-13 21:11:15 +03:00
mikael@zim.(none)
09440e6d7f Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/mikael/bug16370
 2006-03-13 09:59:07 -08:00
mikael@zim.(none)
19b66cd2b2 BUG #16810: Error on coalesce partition 
New test case (bug was already fixed)
 2006-03-13 09:09:25 -08:00
jimw@mysql.com
786abc60a9 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-03-13 08:31:39 -08:00
guilhem@production.mysql.com
aa4de1c9f0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  production.mysql.com:/usersnfs/gbichot/mysql-5.1-new
 2006-03-13 15:45:57 +01:00
guilhem@mysql.com
e485f8e12c Fixes to the replication mixed mode (patch approved by Monty): 
- detect the need for row-based binlogging not at execution stage but earlier at parsing stage; needed for example for CREATE TABLE SELECT UUID().
- more tests of this mixed mode.
 2006-03-13 15:34:30 +01:00
msvensson@shellback.(none)
6a9d3f78d9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-13 15:24:40 +01:00
jimw@mysql.com
cf48e4cde6 Merge mysql.com:/home/jimw/my/mysql-5.1-17097 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-03-13 06:20:20 -08:00
jimw@mysql.com
d7762d4eb2 Merge mysql.com:/home/jimw/my/mysql-5.1-17497 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-03-13 06:18:04 -08:00
jimw@mysql.com
9e2bafbc5f Merge mysql.com:/home/jimw/my/mysql-5.1-14526 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-03-13 06:15:21 -08:00
jimw@mysql.com
f9fa05a0c9 Merge mysql.com:/home/jimw/my/mysql-5.1-14673 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-03-13 06:12:42 -08:00
rburnett@production.mysql.com
b81dbad79b Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  production.mysql.com:/usersnfs/rburnett/mysql-5.1-bug17173
 2006-03-13 14:54:39 +01:00
rburnett@production.mysql.com
c9472ee254 Bug # 17173 - Partitions: less than search fails 
Bug # 17894 - Comparison with "less than" operator fails with range partition

The problem here was that on queries such as < 3, the range given is NULL < n < 3.
The null part works correctly where the null value is stored in rec[0] and the
field is marked as being null.  However, when the 3 is processed, the 3 is places
on rec[0] but the null flag is left uncleared.

partition_range.result:
  Results block for bug #17894
partition_range.test:
  Test block for bug #17894
partition_list.result:
  Results block for bug #17173
partition_list.test:
  Test block for bug #17173
opt_range.cc:
  call set_notnull to clear any null flag that may have been set
 2006-03-13 14:50:16 +01:00
jimw@mysql.com
ed453f077f Bug #17097: Partitions: failing ADD PRIMARY KEY leads to temporary rotten metadata,crash 
When doing an ALTER TABLE on a table using partitioning, force the table
  definition to get reloaded, since it may become invalid whenever the ALTER
  TABLE fails (even for an ALTER TABLE without specific partitioning changes).
 2006-03-13 05:01:11 -08:00
petr@mysql.com
f513420d12 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
 2006-03-13 13:57:22 +03:00
mikael@zim.(none)
6b185a935f BUG#15407: Crash if error in subpartition definition 2006-03-13 02:36:02 -08:00
msvensson@shellback.(none)
130985c2f6 Merge shellback.(none):/home/msvensson/mysql/init_rm/my51-init_rm 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-13 11:32:10 +01:00
msvensson@shellback.(none)
c13ae49342 Merge shellback.(none):/home/msvensson/mysql/init_rm/my50-init_rm 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-13 11:31:15 +01:00
msvensson@shellback.(none)
9afc40fccc Remove also slave clusters data on restart after test failure 2006-03-13 11:30:16 +01:00
msvensson@shellback.(none)
59e7e3810d Merge shellback.(none):/home/msvensson/mysql/init_rm/my50-init_rm 
into  shellback.(none):/home/msvensson/mysql/init_rm/my51-init_rm
 2006-03-13 11:13:58 +01:00
msvensson@shellback.(none)
2628ebe89f Remove printouts 2006-03-13 11:06:14 +01:00
msvensson@shellback.(none)
904e3ca2dc Merge shellback.(none):/home/msvensson/mysql/init_rm/my50-init_rm 
into  shellback.(none):/home/msvensson/mysql/init_rm/my51-init_rm
 2006-03-13 10:36:41 +01:00
msvensson@shellback.(none)
b32f1367fe Make mysql-test-run.pl restore the db(s) to a known state before continuing after test case failure 2006-03-13 10:30:36 +01:00
jmiller@mysql.com
ce3dcff2f3 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-03-13 09:55:42 +01:00
tomas@poseidon.ndb.mysql.com
5a4e512942 changed test to make it predictable 2006-03-13 09:55:41 +01:00
jmiller@mysql.com
92ce845796 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-03-13 09:05:26 +01:00
jmiller@mysql.com
43fb868e65 Test fix 2006-03-13 09:03:05 +01:00
petr@mysql.com
d91ea9e0cb Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
 2006-03-13 10:27:03 +03:00
jonas@perch.ndb.mysql.com
9effe54359 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-03-11 16:11:36 +01:00
tomas@poseidon.ndb.mysql.com
b9dcd3b154 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-03-11 15:55:19 +01:00
tomas@poseidon.ndb.mysql.com
a7e7a1acf4 wl#3023 clean up 
- enabling some new tests
 2006-03-11 15:52:38 +01:00
mikael@zim.(none)
c34c2cfa45 BUG#15961: SUBPARTITION defined in non-subpartitioned table no error 
Made sure that no subpartition stuff in non-subpartitioned table
 2006-03-11 06:17:10 -08:00
mikael@zim.(none)
8d3c7e3b27 BUG#16370: Default subpartitioning not properly handled in conjunction 
with ALTER TABLE ADD/REORGANIZE PARTITION
Ensure that default subpartitioning is removed when subpartitions
are defined in ADD/REORGANIZE PARTITION
 2006-03-11 05:56:06 -08:00
aelkin@mysql.com
897a886f72 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.1 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
 2006-03-11 10:55:36 +02:00
aelkin@mysql.com
659710e29c Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0.20-bug15101-sysdate
 2006-03-11 10:47:25 +02:00
tomas@poseidon.ndb.mysql.com
e4b7cd8eab Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-03-11 07:26:58 +01:00
jonas@perch.ndb.mysql.com
038b361596 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-03-11 07:02:08 +01:00
tomas@poseidon.ndb.mysql.com
485580e436 wl#3023 ndb to return correct tables for initial table maps 
+ removed extra binlog events generated by drop table schema ops to produce predictable test cases
 2006-03-11 06:58:48 +01:00
kent@mysql.com
93da852c6c Merge 2006-03-11 01:53:30 +01:00
kent@mysql.com
013259eaf4 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-03-11 01:42:42 +01:00
ingo@mysql.com
ac287ad34d Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-bug14980
 2006-03-10 22:32:37 +01:00
ingo@mysql.com
972c2a4abc Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug14980
 2006-03-10 22:28:50 +01:00