monty@mysql.com
6c6a25e9d7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-09-24 02:32:34 +03: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
jimw@mysql.com
844d1244d7
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-23 14:44:41 -07:00
sergefp@mysql.com
d90b988da7
BUG#12232: Addressing docs team feedback: s/inequal/unequal/
2005-09-24 01:39:50 +04:00
paul@kite-hub.kitebird.com
67a643f931
mysqld.cc:
...
Fix out-of-order status variable.
2005-09-23 15:59:32 -05:00
jimw@mysql.com
e80673d69d
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-23 13:59:14 -07:00
paul@kite-hub.kitebird.com
b83f29d56d
mysqld.cc:
...
Fix out-of-order status variable.
2005-09-23 14:14:34 -05:00
jani@a193-229-222-105.elisa-laajakaista.fi
8d3036c35e
Some minor fixes revealed as warnings by
...
Intel compiler.
2005-09-23 21:28:56 +03:00
dlenev@mysql.com
19b2cd58e8
Fix for yet another compilation failure on Windows which was 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."
(aka bug #13402 "Windows VS 2003 Compiler error")
2005-09-23 21:28:47 +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
jani@a193-229-222-105.elisa-laajakaista.fi
acf218b708
Several fixes revelaled by Intel compiler.
2005-09-23 16:47:08 +03: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
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
serg@serg.mylan
d4eaa0ecc5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-23 14:36:38 +02:00
osku@127.(none)
06077eb1eb
InnoDB: Minor fixes.
2005-09-23 14:31:31 +03: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
bar@mysql.com
1c38733f4a
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b13046
2005-09-23 12:57:40 +05: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
brian@zim.(none)
f5c00b0dbd
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/fix-5.0
2005-09-22 19:46:16 -07:00
brian@zim.(none)
8eea3e5be0
This fixed bug 13369. Note, I dislike goto's as well.
...
The alias structure now is a bit more simple and just uses a pointer to replace with the currect name. The giant case statement should go away in the next patch.
2005-09-22 16:58:09 -07: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
joerg@mysql.com
cb77a6accb
Fixes needed to build 5.0.13 on Windows:
...
- reflect two "Makefile.am" changes in the respective "VC project" files,
- correct a typo in a (normally) unused macro parameter.
2005-09-22 18:57:07 +02:00
serg@serg.mylan
40c43365c5
fixed a memory leak in ha_tina.cc
2005-09-22 16:05:05 +02:00
marko@hundin.mysql.fi
ff8127ffaa
InnoDB: correct two misleading comments
2005-09-22 13:09:14 +03:00
ramil@mysql.com
5cf4eb0e26
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b11553
2005-09-22 13:05:48 +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
ramil@mysql.com
92306dd089
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b11553
2005-09-22 11:46:54 +05:00
ramil@mysql.com
66929c9540
a fix ( #11553 : gives error if aggregate user-defined function in HAVING clause).
2005-09-22 11:45:16 +05:00
ramil@mysql.com
d9eb8958a2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b11553
2005-09-22 11:39:01 +05: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
bar@mysql.com
d870612ac0
Bug#13046: LIKE pattern matching using prefix
...
index doesn't return correct result
item_cmpfunc.cc:
Use charset of LIKE to decide whether
to use 8bit or Unicode "escape" value.
But use charset of "escape" to scan escape character.
strings/ctype-xxx.c:
We cannot reduce "end" pointer using charpos(),
because of possible escape characters in the string.
Limit the loop using count of written characters instead.
ctype_like_escape.inc:
new file
mysql-test/t/ctype_xxx:
mysql-test/r/ctype_xxx:
Adding test case.
2005-09-21 23:10:51 +05: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