svoj@mysql.com
7c375cab5a
WL#2286 - Compile MySQL w/YASSL support
...
Portability fixes
2005-05-20 19:32:51 +05: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)
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
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
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
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
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
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
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
msvensson@neptunus.(none)
cb5bfad14e
Fix
2005-05-19 12:53:44 +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
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
matt@mysql.com
8091707afe
configure.in:
...
Increment to next version.
2005-05-19 07:22:23 +02:00
monty@mysql.com
1edd387dab
portablity fix
2005-05-19 05:54:31 +03:00
monty@mysql.com
628848df99
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-05-19 04:49:18 +03:00
monty@mysql.com
6cca51f06a
Fixed references to uninitialized memory
2005-05-19 04:48:22 +03:00
monty@mysql.com
96d649d04b
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-05-19 03:17:39 +03:00
jimw@mysql.com
6757a04e4c
Merge mysql.com:/home/jimw/my/mysql-5.0-build
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-05-18 17:13:31 -07:00
jimw@mysql.com
ae52de495a
Revert fix for Bug #6048 : it introduced new problems.
2005-05-18 17:10:48 -07:00
jimw@mysql.com
d5ee234917
Fixes to merge from 4.1
2005-05-18 15:40:34 -07:00
jimw@mysql.com
b7079ed027
Resolve merge from 4.1
2005-05-18 13:54:36 -07:00
bell@book.sanja.is.com.ua
816e84c1f6
Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1
...
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
2005-05-18 22:58:48 +03:00
msvensson@neptunus.(none)
89415d272c
Merge
2005-05-18 20:52:59 +02:00
msvensson@neptunus.(none)
2d515425a3
BUG#9626
...
- Fix valgrind warnings
- Remove static db, schema and table name buffers from Ndb.cpp
2005-05-18 20:50:29 +02:00
monty@mysql.com
7ef7b9ad34
merge
2005-05-18 21:16:14 +03:00
monty@mysql.com
a9c4379c15
Fixed bug from last push
2005-05-18 21:12:59 +03:00
jimw@mysql.com
3f6aad900c
Resolve merge from 4.1
2005-05-18 11:06:34 -07:00
ingo@mysql.com
21bf35fce0
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-05-18 19:45:59 +02:00
ingo@mysql.com
26f2e57ecb
Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
...
After review version.
Added a condition for MERGE tables. These do not have unique
indexes. But every key could be a unique key on the underlying
MyISAM table. So get the maximum key length for MERGE tables
instead of the maximum unique key length. This is used for
buffer allocation in write_record().
2005-05-18 19:40:39 +02:00
jimw@mysql.com
af557076fa
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-18 10:40:22 -07:00
konstantin@mysql.com
e7c6282254
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-05-18 21:13:45 +04:00
konstantin@mysql.com
f03970bb53
Fix a couple of compilation failures.
2005-05-18 21:11:15 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
c63ad3b549
New file default_modify.c. Fixed a typo on mysqld.cc
...
Changed name of function my_correct_default_file to
modify_defaults_file. Improved function and fixed some
bugs in it.
2005-05-18 20:10:17 +03:00
jimw@mysql.com
9ef20027a6
Update mysqldump test and results
2005-05-18 09:40:12 -07:00
konstantin@mysql.com
3b5897e5e9
Fix conflicting declaration and definition of db_output (compilation
...
failure).
2005-05-18 20:30:22 +04:00
jimw@mysql.com
79ce5dcd90
Resolve bugfix merge
2005-05-18 09:25:06 -07:00
jimw@mysql.com
be221cc012
Small optimization to bug fix, from Monty.
2005-05-18 09:12:37 -07:00
konstantin@mysql.com
14d44f19b5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-05-18 20:11:23 +04:00
pekka@mysql.com
6dbcd43224
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41
2005-05-18 18:05:37 +02:00
