ingo@mysql.com
8482de4381
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug10932
2005-12-08 07:56:07 +01:00
patg@krsna.patg.net
bdc737cb5f
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new2
2005-12-07 15:10:26 -08:00
msvensson@devsrv-b.mysql.com
7132edb2d9
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into devsrv-b.mysql.com:/space/magnus/my50-bug9535
2005-12-07 22:30:09 +01:00
dlenev@mysql.com
886ac06c9b
Merge mysql.com:/home/dlenev/src/mysql-5.0-relfix
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-12-08 00:18:37 +03:00
patg@krsna.patg.net
8d88e4e85e
BUG #15559
...
Fixed logic in handler to make handler now show up as enabled.
2005-12-07 12:58:04 -08:00
dlenev@mysql.com
b712dc3339
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-12-07 23:07:06 +03:00
dlenev@mysql.com
56faadcc42
Fix -ansi -pedantic compilation failure. Fix coding style.
2005-12-07 22:36:13 +03:00
anozdrin@mysql.com
b867ef6df0
Fix commit error: sp-vars.test should belong to mysql-test/t directory.
2005-12-07 22:06:30 +03:00
msvensson@neptunus.(none)
e97f16f58d
Merge neptunus.(none):/home/msvensson/mysql/bug9535/my50-bug9535
...
into neptunus.(none):/home/msvensson/mysql/bug9535/my51-bug9535
2005-12-07 19:56:22 +01:00
msvensson@devsrv-b.mysql.com
f2e8bf275f
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug9535/my50-bug9535
...
into devsrv-b.mysql.com:/space/magnus/my50-bug9535
2005-12-07 19:56:03 +01:00
msvensson@neptunus.(none)
662dc37428
Merge neptunus.(none):/home/msvensson/mysql/bug9535/my41-bug9535
...
into neptunus.(none):/home/msvensson/mysql/bug9535/my50-bug9535
2005-12-07 19:53:45 +01:00
ingo@mysql.com
270cad2f63
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug10932
2005-12-07 19:47:55 +01:00
dlenev@mysql.com
246c12edc4
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-12-07 21:21:54 +03:00
konstantin@mysql.com
4821559e47
Fix a compilation failure.
2005-12-07 21:16:04 +03:00
dlenev@mysql.com
8d1292185c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-12-07 20:31:10 +03:00
msvensson@devsrv-b.mysql.com
dd7d2d0a11
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into devsrv-b.mysql.com:/space/magnus/my41-bug9535
2005-12-07 17:42:13 +01:00
pem@mysql.com
d00a6e27d7
Updated sp.result.
2005-12-07 16:58:11 +01:00
jimw@mysql.com
24a40da5e8
Merge mysql.com:/home/jimw/my/mysql-5.0-15510
...
into mysql.com:/home/jimw/my/mysql-5.0-release
2005-12-07 07:37:43 -08:00
konstantin@mysql.com
5517b5d419
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-12-07 18:29:48 +03:00
konstantin@mysql.com
7bb7006d06
Fix -ansi -pedantic compilation failure. Fix coding style.
2005-12-07 18:15:02 +03:00
dlenev@mysql.com
be6ad37227
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-12-07 18:05:31 +03:00
bar@mysql.com
eb49612ff8
Bug#13421 problem with sorting turkish
...
latin5.xml:
- Fixing order thee Turkish letters to conform Turkish rules.
- All non-Turkish accented letters are mappend
to their non-accented counterparts.
2005-12-07 18:48:46 +04:00
msvensson@devsrv-b.mysql.com
440ac6befb
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug9535/my41-bug9535
...
into devsrv-b.mysql.com:/space/magnus/my41-bug9535
2005-12-07 15:46:57 +01:00
msvensson@neptunus.(none)
a626b51dad
BUG#9535 Warning for "create table t as select uuid();"
...
- Set max_length of Item_func_uuid to max_length*system_charset_info->mbmaxlen
Note! Item_func_uuid should be set to use 'ascii' charset when hex(), format(), md5()
etc will use 'ascii'
- Comitting again, the old patch seems to have been lost.
2005-12-07 15:45:31 +01:00
pem@mysql.com
c6dfbefa67
Post-merge fix of sql/share/errmsg.txt
2005-12-07 15:22:01 +01:00
anozdrin@mysql.com
5b981a4844
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-sp-vars-merge-2
2005-12-07 17:17:42 +03:00
pem@mysql.com
8e0e421943
Merge mysql.com:/usr/home/pem/bug14834/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.1-new
2005-12-07 15:17:18 +01:00
anozdrin@mysql.com
0ff8f60b45
Patch for WL#2894: Make stored routine variables work
...
according to the standard.
The idea is to use Field-classes to implement stored routines
variables. Also, we should provide facade to Item-hierarchy
by Item_field class (it is necessary, since SRVs take part
in expressions).
The patch fixes the following bugs:
- BUG#8702: Stored Procedures: No Error/Warning shown for inappropriate data
type matching;
- BUG#8768: Functions: For any unsigned data type, -ve values can be passed
and returned;
- BUG#8769: Functions: For Int datatypes, out of range values can be passed
and returned;
- BUG#9078: STORED PROCDURE: Decimal digits are not displayed when we use
DECIMAL datatype;
- BUG#9572: Stored procedures: variable type declarations ignored;
- BUG#12903: upper function does not work inside a function;
- BUG#13705: parameters to stored procedures are not verified;
- BUG#13808: ENUM type stored procedure parameter accepts non-enumerated
data;
- BUG#13909: Varchar Stored Procedure Parameter always BINARY string (ignores
CHARACTER SET);
- BUG#14161: Stored procedure cannot retrieve bigint unsigned;
- BUG#14188: BINARY variables have no 0x00 padding;
- BUG#15148: Stored procedure variables accept non-scalar values;
2005-12-07 17:01:17 +03:00
dlenev@mysql.com
c5c2874152
Fixed sp-error.test result after merging fix for bug #11555 "Stored procedures:
...
current SP tables locking make impossible view security" with main tree.
2005-12-07 16:55:16 +03:00
pem@mysql.com
771b8c1774
Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/pem/mysql-5.1-new
2005-12-07 12:59:44 +01:00
pem@mysql.com
178fcc4fcd
Fixed compile error in sql_acl.cc.
2005-12-07 12:58:33 +01:00
knielsen@mysql.com
e9e782900f
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/data0/mysqldev/my/mysql-5.0
2005-12-07 12:50:14 +01:00
knielsen@mysql.com
e7d218d2e9
Bump version number following 5.0.17 release clone-off
2005-12-07 12:43:32 +01:00
lenz@mysql.com
be6b8c3b03
Merge lgrimmer@bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/space/my/mysql-5.0
2005-12-07 12:42:36 +01:00
lenz@mysql.com
aaa29e7439
Merge lgrimmer@bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/space/my/mysql-5.1
2005-12-07 12:38:52 +01:00
dlenev@mysql.com
b5e21b60d9
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2
2005-12-07 14:38:20 +03:00
lenz@mysql.com
87fc028284
Merge mysql.com:/space/my/mysql-5.0-merg
...
into mysql.com:/space/my/mysql-5.0
2005-12-07 12:23:53 +01:00
lenz@mysql.com
61a7844163
Merge mysql.com:/space/my/mysql-5.0
...
into mysql.com:/space/my/mysql-5.1
2005-12-07 11:52:47 +01:00
pem@mysql.com
f998eefe0e
Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/pem/mysql-5.1-new
2005-12-07 11:19:51 +01:00
dlenev@mysql.com
40614adf66
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2
2005-12-07 12:47:25 +03:00
lenz@mysql.com
cf7e2b2d6d
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-5.0-merg
2005-12-07 10:40:26 +01:00
dlenev@mysql.com
06b895c096
Fix for bug #11555 "Stored procedures: current SP tables locking make
...
impossible view security".
We should not expose names of tables which are explicitly or implicitly (via
routine or trigger) used by view even if we find that they are missing.
So during building of list of prelocked tables for statement we track which
routines (and therefore tables for these routines) are used from views. We
mark elements of LEX::routines set which correspond to routines used in views
by setting Sroutine_hash_entry::belong_to_view member to point to TABLE_LIST
object for topmost view which uses routine. We propagate this mark to all
routines which are used by this routine and which we add to this set. We also
mark tables used by such routine which we add to the list of tables for
prelocking as belonging to this view.
2005-12-07 12:27:17 +03:00
timour@mysql.com
3d01a3affc
Merge mysql.com:/home/timka/mysql/src/5.0-2486
...
into mysql.com:/home/timka/mysql/src/5.1-dbg
2005-12-07 10:47:43 +02:00
ingo@mysql.com
0d1413411a
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug10932
2005-12-07 09:06:18 +01:00
serg@serg.mylan
e4821e3e9d
merged
2005-12-07 08:50:14 +01:00
timour@mysql.com
ecb41e28f2
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-12-07 08:20:59 +02:00
lenz@mysql.com
74f44b9b9a
Merge mysql.com:/space/my/mysql-4.0
...
into mysql.com:/space/my/mysql-4.1
2005-12-07 06:46:43 +01:00
jimw@mysql.com
548bacf41b
Fix innodb result file (merge clean-up)
2005-12-06 19:55:48 -08:00
jimw@mysql.com
bc4e6f822b
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2005-12-06 18:27:39 -08:00
jimw@mysql.com
642984d420
Fix innodb.result file (was missing a line)
2005-12-06 18:18:35 -08:00