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

15068 commits

Author SHA1 Message Date
reggie@big_geek.
57f56eb4bf Bug #17720 
Minor cleanup from Mikael's review
 2006-03-06 23:18:48 -06:00
serg@serg.mylan
84ff8192ff merged 2006-03-06 23:20:19 +01:00
serg@serg.mylan
d190e08e4e merged 2006-03-06 20:53:14 +01:00
pem@mysql.com
a065843799 Merge mysql.com:/extern/mysql/5.0/generic/mysql-5.0 
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
 2006-03-06 19:46:17 +01:00
petr@mysql.com
0e853c79b7 Fix Bug#17600: Invalid data logged into mysql.slow_log 
Recommit with post-review fixes.
 2006-03-06 21:03:17 +03:00
serg@serg.mylan
e7504b3468 merged 2006-03-06 18:34:38 +01:00
serg@serg.mylan
0b2f4ac3be kill (subquery) - three years old bugfix that never worked 2006-03-06 18:26:39 +01:00
holyfoot@mysql.com
8707e3356d Merge mysql.com:/home/hf/work/mysql-5.0.15745 
into mysql.com:/home/hf/work/mysql-5.0.mrg
 2006-03-06 19:57:20 +04:00
msvensson@neptunus.(none)
c9d14a0329 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-06 14:03:16 +01:00
bar@mysql.com
6823225a81 Merge mysql.com:/usr/home/bar/mysql-4.1.b15949 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-03-06 16:20:15 +04:00
gluh@mysql.com
7f4b27cf29 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2006-03-06 15:58:16 +04:00
msvensson@devsrv-b.mysql.com
ee97bebc8c Merge bk-internal:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
 2006-03-06 12:28:30 +01:00
kent@mysql.com
ff71af1e01 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-03-06 12:21:10 +01:00
kent@mysql.com
dfae81d014 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-03-06 12:15:26 +01:00
gluh@mysql.com
321eb3dce6 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2006-03-06 15:15:23 +04:00
msvensson@devsrv-b.mysql.com
2660607096 Merge devsrv-b.mysql.com:/space/magnus/mysql-5.0 
into  devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
 2006-03-06 12:04:54 +01:00
msvensson@neptunus.(none)
e4705ea4bf Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-06 11:51:46 +01:00
bar@mysql.com
e019d60536 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b15949
 2006-03-06 14:50:34 +04:00
msvensson@neptunus.(none)
40b3222b74 Merge neptunus.(none):/home/msvensson/mysql/bug10460/my51-bug10460 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-06 11:39:36 +01:00
gluh@mysql.com
69e8b9d06e 4.1 -> 5.0 merge 2006-03-06 14:38:31 +04:00
gluh@eagle.intranet.mysql.r18.ru
f1eaf7e8ec Fix for bug#14385 GRANT and mapping to correct user account problems 
Check if the host of table hash record exactly matches host from GRANT command
 2006-03-06 14:03:40 +04:00
timour@mysql.com
593bd1d3b8 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-15229
 2006-03-06 11:41:19 +02:00
mskold@mysql.com
a34be87ff3 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-03-06 10:30:36 +01:00
mskold@mysql.com
7380a4dd22 Fix for Bug#17888 DD: ADD INDEX causes error 756 'Index on disk column is not supported 2006-03-06 10:24:06 +01:00
gluh@eagle.intranet.mysql.r18.ru
33e7d20f37 Fix for bug#16678 FORMAT gives wrong result if client run with default-character-set=utf8 
calculate Item_func_format::max_length using charset->mbmaxlen
 2006-03-06 12:52:38 +04:00
holyfoot@deer.(none)
a920d0df86 bug #15745 (COUNT(DISTINCT CONCAT(x,y)) returns wrong result 2006-03-05 20:48:31 +04:00
dlenev@mysql.com
0fb4a6645e Merge mysql.com:/home/dlenev/src/mysql-5.0-bg17866-2 
into  mysql.com:/home/dlenev/src/mysql-5.0-merges
 2006-03-04 23:58:48 +03:00
reggie@big_geek.
97a4671f1f Bug #17720 Partition ALTER TABLE fails on rename of .MYI file 
Fix this by passing the HA_EXTRA_PREPARE_FOR_DELETE onto the newly added or about to be dropped partitions
so they have an opportunity to close their OS file handle.
 2006-03-04 14:21:27 -06:00
konstantin@mysql.com
40b368af16 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/opt/local/work/mysql-4.1-root
 2006-03-04 22:33:19 +03:00
dlenev@mysql.com
efe0900669 Fix for bug #17866 "Problem with renaming table with triggers with fully 
qualified subject table" which was introduced during work on bug #13525
"Rename table does not keep info of triggers".

The bug was caused by the fact that during reconstruction of CREATE TRIGGER
statement stored in .TRG file which happened during RENAME TABLE we damaged
trigger definition in case when it contained fully qualified name of subject
table (see comment for sql_yacc.yy for more info).
 2006-03-04 16:55:06 +03:00
petr@mysql.com
965fd06afa Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/cps/mysql/devel/5.1-cleanup
 2006-03-04 11:52:02 +03:00
petr@mysql.com
0a861ec8c5 Remove unused thd->options's flag -- OPTION_UPDATE_LOG 
The update log itself was removed back in 5.0. Recommit
with post-review fixes.
 2006-03-04 11:20:56 +03:00
pem@mysql.com
2b6f510350 Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0
 2006-03-03 19:18:17 +01:00
pem@mysql.com
b66567f619 Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-release
 2006-03-03 18:51:13 +01:00
bar@mysql.com
f516d1f9f2 Bug#16318: XML: extractvalue() incorrectly returns last() = 1 
xml.result, xml.test:
  Adding test case.
item_xmlfunc.cc:
  - adding "size" member into MY_XPATH_FLT struct,
  to pass parent's context size when iterating
  in a predicate. Previously, temporaty context
  size was calculated instead, which is always 1.
  As a result, things like last() and count() 
  didn't work fine.
  - adding iteration into Item_func_xpath_elementbyindex:
  similar to Item_func_xpath_predicate.
  This is to make things like last() and count()
  work inside square brackets.
 2006-03-03 18:36:14 +04:00
pem@mysql.com
9e001880df Merge mysql.com:/extern/mysql/bk/mysql-5.1-new 
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
 2006-03-03 15:02:37 +01:00
ramil@mysql.com
f864fc7ee6 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2006-03-03 17:22:20 +04:00
evgen@moonbone.local
62a266f114 Fixed bug#17726: Not checked empty list caused endless loop 
When the Item_cond::fix_fields() function reduces cond tree, it in loop
scans it's own list and when it founds Item_cond with same function (AND
or OR) it does next things: 1) replaces that item with item's list. 2)
empties item's list. Due to this operation is done twice - for update and
for view, at the update phase cond's list of lower view is already empty.
Empty list returns ref to itself, thus making endless loop by replacing
list with itself, emptying, replacing again and so on. This results in
server hung up.

To the Item_cond::fix_fields() function added check that ensures that
list being replaced with isn't empty.
 2006-03-03 16:19:57 +03:00
bar@mysql.com
7dc12415e9 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16316
 2006-03-03 17:00:03 +04:00
joerg@debian.(none)
e5b149d1e7 Merge joerg@trift2:/M50/patch-17595 into debian.(none):/M50/clone-5.0 2006-03-03 12:50:15 +01:00
gluh@mysql.com
ab67605976 Merge mysql.com:/home/gluh/MySQL/Merge/mysql-5.0-release 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2006-03-03 15:39:38 +04:00
ramil@mysql.com
d47b351204 Merge mysql.com:/usr/home/ram/work/mysql-4.1 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2006-03-03 15:32:00 +04:00
gluh@eagle.intranet.mysql.r18.ru
f3e993d9a6 Fix for bug#17826 'type_decimal' fails with ps-protocol 
removed unnecessary calculation of cache value 
 otherwise Join::preapre tries to calculate 
 undefined values(filed values)
 2006-03-03 15:29:39 +04:00
pem@mysql.com
015ab71a50 Merge mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0 
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
 2006-03-03 12:03:27 +01:00
mats@mysql.com
e0f5d35ceb Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/w3023-mysql-5.1-new
 2006-03-03 09:57:42 +01:00
mats@mysql.com
0ffd1be87d WL#3023 (RBR: Use locks in a statement-like manner): 
More adaptions to make it work with existing code base.
 2006-03-03 09:49:46 +01:00
ramil@mysql.com
1a07140515 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b17615
 2006-03-03 09:35:25 +04:00
ramil@mysql.com
1301484679 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b13659
 2006-03-03 09:34:40 +04:00
cmiller@zippy.(none)
c672c119e3 Expanding a binary field should result in 0x00-filled positions, not 0x20 
(ASCII space).  For Bug#16857.
 2006-03-02 20:49:10 -05:00
cmiller@zippy.(none)
5147bb8e9b Expanding a binary field should result in 0x00-filled positions, not 0x20 
(ASCII space).  For Bug#16857.
 2006-03-02 19:59:49 -05:00