mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32024 commits 2780 branches 343 tags 1.6 GiB
Commit graph

32024 commits

This branch
This branch
All branches
Author SHA1 Message Date
mikael@zim.(none)
cad342ae02 Merge zim.(none):/home/mikael/bug17127 
into  zim.(none):/home/mikael/bug16370
 2006-03-14 02:50:29 -08:00
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
hartmut@mysql.com
5e312c1581 Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0 
into  mysql.com:/home/hartmut/projects/mysql/bk-clean/5.1
 2006-03-14 11:25:15 +01:00
hartmut@mysql.com
9da74d8a5f relying on loop counter variables being local to the loop body if 
declared in the 'for' statement is not portable, some compilers
still don't implement this ANSI C++ specification (Bug #14995)
 2006-03-14 11:13:41 +01: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
mikael@zim.(none)
4adb973df4 BUG#15961: After review fixes 
New error message
 2006-03-14 00:39:06 -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
jimw@mysql.com
741b14a0ef Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-03-13 10:59:42 -08:00
gbichot@production.mysql.com
8a7a35fd3f 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 19:59:27 +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
paul@snake-hub.snake.net
01d94fa5b5 mysqld.cc: 
Revise option description. And let's put it in the proper
  lexical order within the option list.
 2006-03-13 11:58:36 -06: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
knielsen@mysql.com
39aa4776b3 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/mysql/tmpbuild-5.1
 2006-03-13 16:35:01 +01:00
knielsen@mysql.com
140523a6f5 Fix compile problem (jump across initialization). 2006-03-13 16:32:45 +01:00
rburnett@production.mysql.com
a630375b32 post-commit: 
Small change to enable sending of mails from Windows bk clones
 2006-03-13 16:16:46 +01:00
knielsen@mysql.com
7f27d9824f Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2006-03-13 16:08:20 +01:00
knielsen@mysql.com
4d3ad1564d Misc. portability compile fixes. 2006-03-13 16:07:00 +01:00
jonas@perch.ndb.mysql.com
fc8fdd2517 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-13 15:53:53 +01: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
jonas@perch.ndb.mysql.com
95468faab3 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-03-13 14:49:15 +01:00
jonas@perch.ndb.mysql.com
819b629c30 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-03-13 14:44:36 +01:00
jonas@perch.ndb.mysql.com
b77bf0906b Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
 2006-03-13 14:43:58 +01:00
jonas@perch.ndb.mysql.com
0be6fc3d91 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-03-13 14:43:30 +01:00
jonas@perch.ndb.mysql.com
754989c602 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
 2006-03-13 14:43:07 +01:00
jonas@perch.ndb.mysql.com
fa2263f4a6 bug#14028 - 
ndb crash if trigger record get to big, fix incorrect max size of trigger record
 2006-03-13 14:42:16 +01:00
jonas@perch.ndb.mysql.com
18013bbb94 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-03-13 14:40:32 +01:00
jonas@perch.ndb.mysql.com
47fb7a3b6a bug#14028 - 
ndb crash if trigger record get to big, fix incorrect max size of trigger record
 2006-03-13 14:38:12 +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
jonas@perch.ndb.mysql.com
ce81e2b090 Merge perch.ndb.mysql.com:/home/jonas/src/51-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-03-13 13:49:37 +01:00
jonas@perch.ndb.mysql.com
ee7ffddf01 ndb - bug#18026 
incorrect handling of varsize primary key and charsets in tup-scan
 2006-03-13 13:37:42 +01:00
jonas@perch.ndb.mysql.com
4561b28df2 ndb - bug#16669 
put nrtrace in out file instead (debug compiled..)
 2006-03-13 12:29:43 +01:00
Reggie@xgeek.
d39e92049f Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  xgeek.:C:/work/mysql-5.1-new
 2006-03-13 05:20:00 -06:00
Reggie@xgeek.
36121ee7ba base: 
Fixed problem where taocrypt was defined too early in the process
 2006-03-13 05:17:23 -06: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