monty@mysql.com
f5f92ce146
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-05-20 17:32:35 +03:00
gluh@gluh.mysql.r18.ru
d3833fa4ff
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/release/mysql-5.0
2005-05-20 18:32:34 +04: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
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)
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
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
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
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
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
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
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
serg@serg.mylan
8044488d7c
merged
2005-05-18 22:14:08 +02:00
serg@serg.mylan
2e93680773
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-05-18 21:36:46 +02:00
serg@serg.mylan
50d369bb43
udf: when banning paths from soname in CREATE FUNCTION, check for \ on windows.
...
when reporting an error, use an appropriate buffer for udf->name
2005-05-18 21:31:39 +02: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
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
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
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
konstantin@mysql.com
8b302cbb99
A draft comment for mysql_select. Feel free to moderate and improve.
2005-05-18 19:35:20 +04: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
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
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
igor@rurik.mysql.com
3199272e65
sql_yacc.yy:
...
Added missing ';'.
2005-05-18 04:17:13 -07:00
ramil@mysql.com
e08c287c93
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b10339
2005-05-18 14:50:57 +05:00
gluh@mysql.com
4047905d8e
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9286
2005-05-18 14:48:04 +05:00
ramil@mysql.com
66b6bbfaea
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b10339
2005-05-18 14:46:05 +05:00
pem@mysql.com
38c44af8b8
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-05-18 11:09:30 +02:00