serg@serg.mylan
4b24f83f8f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-25 16:07:13 +02:00
serg@serg.mylan
86ad035270
test case fixed to pass w/o innodb
2005-09-25 15:44:05 +02:00
sergefp@mysql.com
2294c9b57a
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug13317
2005-09-25 01:36:26 +04:00
kent@mysql.com
4e289272b2
mysqlbinlog.test:
...
Windows have no 'cat' command, use <
mysql.test:
Windows can't handle single quotes in --exec line
2005-09-24 04:11:51 +02:00
sergefp@mysql.com
061d660615
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-merge-sept24
2005-09-24 03:33:26 +04:00
sergefp@mysql.com
9a05a887de
Manually merged
2005-09-24 02:39:52 +04:00
sergefp@mysql.com
d0a97917a2
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug13419
2005-09-24 01:55:09 +04:00
sergefp@mysql.com
d90b988da7
BUG#12232: Addressing docs team feedback: s/inequal/unequal/
2005-09-24 01:39:50 +04:00
jimw@mysql.com
3cd331c29f
Merge mysql.com:/home/jimw/my/mysql-5.0-13361
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-23 10:03:29 -07:00
dlenev@mysql.com
d68f3ea17d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg13407
2005-09-23 18:30:08 +04:00
osku@127.(none)
93671fb91e
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql/5.0/clean
2005-09-23 16:46:59 +03:00
osku@127.(none)
d563a01afe
Merge 127.(none):/home/osku/mysql/5.0/clean
...
into 127.(none):/home/osku/mysql/5.0/3443
2005-09-23 16:44:25 +03:00
osku@127.(none)
d61708d1c9
Fix bug #3443 , better foreign key error messsages.
2005-09-23 16:22:27 +03:00
dlenev@mysql.com
77ac122350
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg13407
2005-09-23 17:10:05 +04:00
dlenev@mysql.com
3f9163b074
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-rmuqf
2005-09-23 17:03:49 +04:00
dlenev@mysql.com
b37c586ffe
Fixed race conditions in rpl_multi_update and rpl_multi_delete tests which
...
caused spurious test failures.
2005-09-23 16:59:19 +04:00
msvensson@neptunus.(none)
22c1bb4e6d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-23 14:38:26 +02:00
msvensson@neptunus.(none)
d55eeed8fd
Merge from 4.1 to 5.0
2005-09-23 14:37:22 +02:00
sergefp@mysql.com
40ba88ca07
Fix for BUG#13419: In "ref" optimizer, take into account that item=Item_func_in(x,y) is
...
not equivalent to "x=y" when item->negated == TRUE.
2005-09-23 13:43:20 +04:00
osku@127.(none)
945ea8a98b
Merge 127.(none):/home/osku/mysql/5.0/clean
...
into 127.(none):/home/osku/mysql/5.0/13315
2005-09-23 11:22:05 +03:00
osku@127.(none)
e6b3261556
InnoDB: Fix bug #13315 , index columns having a maximum length of 767.
2005-09-23 11:20:34 +03:00
msvensson@neptunus.(none)
02c7645cc1
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-23 09:18:56 +02:00
konstantin@mysql.com
2d4c54ba1b
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-09-23 00:46:59 +04:00
dlenev@mysql.com
87dcb3c6f5
Fix for bug #13407 "Remote connecting crashes server" and couple of similar
...
problems which were introduced during work on WL#2787 "Add view definer/owner
to the view definition (.frm) to check privileges on used tables and stored
routines when using a VIEW."
In some cases it is better to use value from Security_context::host_or_ip
instead of value from Security_context::host since the latter can be NULL
in certain situations (When we can't resolve hostname or we have not done
this yet).
2005-09-22 23:03:53 +04:00
jimw@mysql.com
90d6195f04
Fix handling of NULL values in decimal fields in FORMAT(). (Bug #13361 )
2005-09-22 11:40:22 -07:00
gluh@mysql.com
47807ba5ab
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/gluh/MySQL/Merge/4.1
2005-09-22 12:46:50 +05:00
gluh@eagle.intranet.mysql.r18.ru
88ef33e542
Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting
...
set auto_increment_field_not_null to true to preserve zero values
for autoincrement fields during LOAD DATA execution if
NO_AUTO_VALUE_ON_ZERO sql mode is set
2005-09-22 12:46:01 +05:00
jonas@perch.ndb.mysql.com
2a002fc1ef
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-22 09:20:23 +02:00
jonas@perch.ndb.mysql.com
1694447823
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-22 09:13:14 +02:00
jonas@perch.ndb.mysql.com
1f84a13977
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2005-09-22 09:10:11 +02:00
jonas@perch.ndb.mysql.com
f5761aa4e8
Add testcase for bug#13316
...
ndb big alter table
2005-09-22 09:09:27 +02:00
monty@mysql.com
82fc54781b
Fixed problems found by valgrind
...
Fixed problems in test suite where some test failed
Fixed access to not initialized memory in federated
Fixed access to not initialized memory when using BIT fields in internal temporary tables
2005-09-22 03:23:07 +03:00
evgen@moonbone.local
2ba1eb1486
Manual merge
2005-09-22 02:38:14 +04:00
konstantin@mysql.com
6f8d3c4844
A fix and a test case for Bug#6513 "Test Suite: Values inserted by using
...
cursor is interpreted latin1 character and Bug#9819 "Cursors: Mysql Server
Crash while fetching from table with 5 million records."
A fix for a possible memory leak when fetching into an SP cursor
in a long loop.
The patch uses a common implementation of cursors in the binary protocol and
in stored procedures and implements materialized cursors.
For implementation details, see comments in sql_cursor.cc
2005-09-22 02:11:21 +04:00
evgen@moonbone.local
5065d73ebb
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/13180-bug-4.1-mysql
2005-09-22 01:48:39 +04:00
evgen@moonbone.local
b7e8c8b112
Fix bug #13180 thd->allow_sum_funcs wasn't reset before query processing.
...
thd->allow_sum_func was left 'true' after previous statement thus allowing
sum funcs to be present in conditions.
thd->allow_sum_func should be set to 0 for each query and each prepared
statement reinitialization. This is done in lex_start() and
reset_stmt_for_execute().
2005-09-22 01:38:39 +04:00
sergefp@mysql.com
7c590486d3
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug13317
2005-09-21 21:39:45 +04:00
sergefp@mysql.com
7aca974fc8
Fix for BUG#13317: Make range optimizer able to produce ranges for "view.field IN (c1,c2)"
...
and "view.field BETWEEN c1 AND c2"
2005-09-21 21:36:15 +04:00
timour@mysql.com
ba9e3ca1a4
Merge mysql.com:/home/timka/mysql/src/4.1-virgin
...
into mysql.com:/home/timka/mysql/src/4.1-dbg
2005-09-21 18:58:39 +03:00
serg@serg.mylan
306aa15391
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-merged
2005-09-21 17:42:44 +02:00
serg@serg.mylan
3b41e3362b
aftermerge fix
2005-09-21 17:38:26 +02:00
lars@mysql.com
83491f97f6
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-rollback-comment
2005-09-21 15:35:37 +02:00
lars@mysql.com
ed7eac5973
Added clarification comment regarding added ROLLBACK to mysqlbinlog output
2005-09-21 14:27:41 +02:00
serg@serg.mylan
a083ff160e
merged
2005-09-21 13:53:22 +02:00
serg@serg.mylan
23f35495ac
merged
2005-09-21 12:37:51 +02:00
ramil@mysql.com
c2be8dccff
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b7589
2005-09-21 14:33:39 +05:00
ramil@mysql.com
986a51e447
a fix (bug #7589 : Decimal types are ignored when updating data from another column).
2005-09-21 14:32:19 +05:00
msvensson@neptunus.(none)
f6b8032af5
Don't add all args to mysqltest to MYSQL_TEST env var
2005-09-21 10:24:46 +02:00
timour@mysql.com
6ae8a56f72
Merge mysql.com:/home/timka/mysql/src/4.1-virgin
...
into mysql.com:/home/timka/mysql/src/4.1-dbg
2005-09-21 09:53:42 +03:00
timour@mysql.com
633d118d01
Fix for BUG#12882 - min/max inconsistent on empty table.
...
The problem was in that the MIN/MAX optimization in opt_sum_query was
replacing MIN/MAX functions with their constant argument without
taking into account that a query has no result rows.
2005-09-21 09:49:19 +03:00