ramil@mysql.com
d7a98ea7b8
Merge mysql.com:/usr/home/ram/work/mysql-4.1-build
...
into mysql.com:/usr/home/ram/work/mysql-4.1
2005-05-20 18:52:55 +05:00
ramil@mysql.com
68d17a209d
Merge mysql.com:/usr/home/ram/work/mysql-4.1-build
...
into mysql.com:/usr/home/ram/work/mysql-5.0-build
2005-05-20 18:51:13 +05:00
ramil@mysql.com
bb9dc47d3d
a fix (bug #10757 : gis-rtree.test fails)
2005-05-20 18:48:18 +05:00
monty@mysql.com
2229d9a964
Add missing test result
2005-05-20 16:31:46 +03:00
lars@mysql.com
d158d2e755
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1
2005-05-20 15:30:15 +02:00
bell@sanja.is.com.ua
e37fbf2382
Macos 10.4 compatibility changes
2005-05-20 16:21:23 +03:00
kent@mysql.com
94142fa0d0
my_vsnprintf.c, sql_select.cc, sql_delete.cc, field_conv.cc, rt_split.c:
...
Fixes for valgrind errors and compatiblity issues by Monty
2005-05-20 15:17:13 +02:00
monty@mysql.com
9c45c28d11
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-05-20 16:16:22 +03:00
monty@mysql.com
0b75f6e37b
compatibility issues
...
Fixed errors reported by valgrind (some errors in NDB remains)
2005-05-20 16:14:35 +03:00
bell@sanja.is.com.ua
77735f2f35
do not try to use equal field from outer query as field of local join (BUG#6384)
2005-05-20 16:01:41 +03:00
gluh@gluh.mysql.r18.ru
075a730328
Merge gluh.mysql.r18.ru:/home/gluh/release/mysql-5.0-build
...
into gluh.mysql.r18.ru:/home/gluh/release/mysql-5.0
2005-05-20 16:55:00 +04:00
gluh@gluh.mysql.r18.ru
68317fcb0c
addition of "REFERENCED_TABLE_SCHEMA",
...
"REFERENCED_TABLE_NAME", "REFERENCED_COLUMN_NAME" fields into
KEY_COLUMN_USAGE table
2005-05-20 16:39:28 +04:00
ndbdev@dl145c.mysql.com
f0f8b0a97b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-05-20 06:25:02 +02:00
jimw@mysql.com
ed674271d4
Merge mysql.com:/home/jimw/my/mysql-5.0-build
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-05-19 17:43:17 -07:00
jimw@mysql.com
7582b3d82d
Merge mysql.com:/home/jimw/my/mysql-5.0-8271
...
into mysql.com:/home/jimw/my/mysql-5.0-build
2005-05-19 15:14:02 -07:00
msvensson@neptunus.(none)
720b8f4242
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-20 00:05:24 +02:00
msvensson@neptunus.(none)
3f97312341
Change to 5.0.7(again)
2005-05-20 00:04:43 +02:00
msvensson@neptunus.(none)
c4787eec11
Merge mysqldev@production.mysql.com:my/mysql-5.0-build
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-build
2005-05-19 23:56:16 +02:00
msvensson@neptunus.(none)
08d8be1461
Cset exclude: matt@mysql.com|ChangeSet|20050519052223|06259
...
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050425090838|60886
2005-05-19 23:52:17 +02:00
jimw@mysql.com
a33a283a49
Fix change to allow FIFO as log. (Bug #8271 )
2005-05-19 14:43:10 -07:00
reggie@mdk10.(none)
0e8e44e70d
BUG# 10687 - MERGE engine fails under Windows
...
This patch was submitted by Ingo and it appears to work correctly.
2005-05-19 16:02:14 -05:00
reggie@mdk10.(none)
9a1daa6957
Merge mdk10.(none):/home/reggie/bk/mysql-4.1
...
into mdk10.(none):/home/reggie/bk/mysql-5.0
2005-05-19 15:50:44 -05:00
svoj@mysql.com
f80d3489c9
Merge mysqldev@production.mysql.com:my/mysql-5.0-build
...
into mysql.com:/home/svoj/devel/mysql/mysql-5.0-build
2005-05-20 01:49:17 +05:00
svoj@mysql.com
36641e3bb7
WL#2286 - Compile MySQL w/YASSL support
...
compilation fixes
2005-05-20 01:44:05 +05:00
msvensson@neptunus.(none)
2849769fbe
Merge mysqldev@production.mysql.com:my/mysql-5.0-build
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-build
2005-05-19 22:23:59 +02:00
reggie@mdk10.(none)
b5a60fe2a8
This fixed a compile problem on Windows
...
sql_udf.cc:
changed dl_name to udf->dl in mysql_create_function
2005-05-19 15:18:49 -05:00
ramil@mysql.com
b06181bccd
hf's fix for bug #9060 (FORMAT returns incorrect result)
...
we need proper rounding there
2005-05-20 01:04:08 +05:00
serg@serg.mylan
ade7854b4a
after merge
2005-05-19 20:54:37 +02:00
msvensson@neptunus.(none)
72dcde4111
Merge neptunus.(none):/home/msvensson/mysql/bug9626
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-build
2005-05-19 20:41:23 +02:00
msvensson@neptunus.(none)
920c16c055
BUG#9626 valgrind warnings
...
- after review fixes
2005-05-19 20:38:48 +02:00
ramil@mysql.com
b9fba04f68
Merge mysql.com:/usr/home/ram/work/mysql-4.1-build
...
into mysql.com:/usr/home/ram/work/mysql-4.1
2005-05-19 23:31:40 +05:00
ramil@mysql.com
ad2e3a6170
Merge mysql.com:/usr/home/ram/work/mysql-4.1-build
...
into mysql.com:/usr/home/ram/work/mysql-5.0-build
2005-05-19 22:55:10 +05:00
ramil@mysql.com
9fe71c13e0
hf's fix for bug #10626 ( gis.test fails)
2005-05-19 22:53:35 +05:00
ndbdev@dl145c.mysql.com
4b47828478
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-05-19 18:37:33 +02:00
magnus@msdesk.mysql.com
cda0a0c96e
Merge mysqldev@production.mysql.com:my/mysql-5.0-build
...
into msdesk.mysql.com:/home/magnus/mysql-5.0-build
2005-05-19 16:10:34 +02:00
magnus@msdesk.mysql.com
8a0f304375
Fix
2005-05-19 16:00:32 +02:00
ramil@mysql.com
c2f31a5f0d
a fix ( #10742 : Can't compile "sql_lex.cc" on AIX 5.2).
2005-05-19 18:56:01 +05:00
serg@serg.mylan
23a59c9857
merged
2005-05-19 15:20:10 +02:00
ramil@mysql.com
eed75b052d
a fix (bug #10599 : Numeric function 'abs' make server crash).
2005-05-19 17:59:14 +05:00
msvensson@neptunus.(none)
a996abc594
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug9626
2005-05-19 14:53:57 +02:00
lars@mysql.com
3e25e5867d
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1
2005-05-19 12:59:46 +02:00
msvensson@neptunus.(none)
cb5bfad14e
Fix
2005-05-19 12:53:44 +02:00
lars@mysql.com
60021dbe02
CSC#4944: Adding File_size to output of SHOW BINARY lOGS
2005-05-19 12:34:15 +02:00
konstantin@mysql.com
f30f95183b
Change the return type back to int (modify_defaults_file).
...
This fixes a compilation failure in mysql_com.h, which doesn't have
'uint' alias visibile. Maybe worth while changing to unsigned int, but
the rest of functions that work with defaults files return int.
2005-05-19 14:02:12 +04:00
ramil@mysql.com
c7fd7a3c6a
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b6961
2005-05-19 14:03:41 +05:00
ramil@mysql.com
4630afa4b7
a fix (bug #10599 : Numeric function 'abs' make server crash).
2005-05-19 13:35:13 +05:00
serg@serg.mylan
1bb2a929fb
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-05-19 09:50:43 +02:00
serg@serg.mylan
541ff258bf
after merge fix
2005-05-19 09:47:13 +02:00
ramil@mysql.com
c09975eb96
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b6961
2005-05-19 12:06:40 +05:00
tulin@dl145c.mysql.com
be861a7ccf
merge
2005-05-19 09:04:24 +02:00