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
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
konstantin@mysql.com
334e302ef0
Merge mysql.com:/opt/local/work/mysql-5.0-root
...
into mysql.com:/media/sda1/mysql/mysql-5.0-libtool
2005-05-18 20:01:47 +04:00
monty@mysql.com
e3111b31d1
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-05-18 19:01:16 +03:00
monty@mysql.com
db40af2a6f
Fix warnings from icc
...
Added BUILD scripts for icc
Fixed (one time) memory leak in grant handling
2005-05-18 19:00:21 +03:00
pekka@mysql.com
c054f84ae3
ndb - allow upgrade 4.1.10->4.1.12
2005-05-18 17:47:43 +02:00
konstantin@mysql.com
8b302cbb99
A draft comment for mysql_select. Feel free to moderate and improve.
2005-05-18 19:35:20 +04:00
kent@mysql.com
2b5f9fad81
make_win_src_distribution.sh:
...
Add YASSL to Windows source distribution
Skip .deps, and remove .o files from source dist
2005-05-18 16:04:44 +02:00
bell@book.sanja.is.com.ua
b22e2aca56
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 16:58:37 +03:00
bell@book.sanja.is.com.ua
203881d9a9
reduced 1 server reloding during test
2005-05-18 16:41:32 +03:00
schwenke@lmy003.wdf.sap.corp
ca5b291be0
Merge aschwenke@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy003.wdf.sap.corp:/home/schwenke/Work/MySQL/bk-internal-tree/mysql-5.0
2005-05-18 15:34:49 +02:00
schwenke@lmy003.wdf.sap.corp
badfc2e4a9
new build scripts for SAP team
2005-05-18 15:28:51 +02:00
ramil@mysql.com
8add105ff5
Merge mysql.com:/usr/home/ram/work/mysql-5.0-build
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-05-18 18:15:14 +05:00
pem@mysql.com
65bce553c5
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-05-18 14:31:15 +02:00
petr@mysql.com
2a5f8ffec1
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-05-18 16:31:14 +04:00
igor@rurik.mysql.com
80aa0062db
olap.result, olap.test:
...
Added test cases for bug #7914 .
sql_select.cc:
Fixed bug #7914 : rollup over expresssions such as sum(a)+1.
2005-05-18 05:15:48 -07:00
georg@lmy002.wdf.sap.corp
2b04efe21e
fixed fatal compiler error (windows)
2005-05-18 14:13:58 +02:00
petr@mysql.com
8053dbca53
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-05-18 16:07:12 +04:00
petr@mysql.com
5395a2db7e
fix for compilation problem with --with-openssl reported by Guilhem
2005-05-18 16:05:58 +04:00
georg@lmy002.wdf.sap.corp
b01ad9f88c
Merge grichter@bk-internal1.mysql.com:/home/bk/mysql-5.0
...
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
2005-05-18 13:57:33 +02:00
pem@mysql.com
bc9e072eff
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-05-18 13:37:59 +02:00
petr@mysql.com
1c376d7da4
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-05-18 15:29:37 +04:00
petr@mysql.com
67364e99af
fix comments
2005-05-18 15:28:38 +04:00
