msvensson@neptunus.(none)
0705a2b1ca
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-12-12 15:22:25 +01:00
msvensson@neptunus.(none)
e0142f908e
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/bug9535/my51-bug9535
2005-12-12 15:19:14 +01:00
anozdrin@mysql.com
de84d76299
Merge WL#2984
2005-12-12 13:29:48 +03:00
anozdrin@mysql.com
5d105fb7e7
Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984
...
into mysql.com:/home/alik/MySQL/devel/5.1-wl2984-merge
2005-12-09 15:14:19 +03:00
aivanov@mysql.com
081b2cc6c8
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alexi/innodb-ss/mysql-5.1-new
2005-12-08 15:06:26 +03:00
aivanov@mysql.com
141805f9c8
The innodb-5.0-ss52 snapshot changes were erroneously auto-merged
...
to 5.1. Undoing the merge.
2005-12-08 15:00:18 +03: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
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
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@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
konstantin@mysql.com
4821559e47
Fix a compilation failure.
2005-12-07 21:16:04 +03:00
pem@mysql.com
d00a6e27d7
Updated sp.result.
2005-12-07 16:58:11 +01: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
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
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
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
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
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
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
jimw@mysql.com
a910cfd663
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-06 18:15:18 -08:00
jimw@mysql.com
68bc3dd1fd
Merge mysql.com:/home/jimw/my/mysql-5.0-14299
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-06 14:16:34 -08:00
konstantin@mysql.com
712385568f
A fix and a test case for Bug#15392 "Server crashes during
...
prepared statement execute
2005-12-07 00:57:15 +03:00
serg@serg.mylan
eb5ccee783
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-12-06 22:31:09 +01:00
jimw@mysql.com
5d701c2db5
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2005-12-06 12:29:30 -08:00
aivanov@mysql.com
adc8051c71
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss52
2005-12-06 23:15:21 +03:00
paul@kite-hub.kitebird.com
5cf9a20c9a
mysqld.cc:
...
Put options in order.
set_var.cc:
Put system variables back in order.
2005-12-06 13:21:29 -06:00
aivanov@mysql.com
9eee25472e
Fix BUG#14747: "Race condition can cause btr_search_drop_page_hash_index()
...
to crash".
Changes from snapshot innodb-5.0-ss52.
Note that buf_block_t::index should be protected by btr_search_latch
or an s-latch or x-latch on the index page.
btr_search_drop_page_hash_index(): Read block->index while holding
btr_search_latch and use the cached value in the loop. Remove some
redundant assertions.
Also fix 13778. When FOREIGN_KEY_CHECKS=0 we still need to check that
datatypes between foreign key references are compatible.
Also added test cases to 9802.
2005-12-06 22:02:40 +03:00
jimw@mysql.com
6ec4bcc664
Merge mysql.com:/home/jimw/my/mysql-5.1-bdb
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2005-12-06 10:57:55 -08:00
jimw@mysql.com
692a5ebbf9
Update BDB project file for Windows build
2005-12-06 09:54:28 -08:00
serg@serg.mylan
1aa775aa44
Merge
2005-12-06 18:21:46 +01:00
jimw@mysql.com
5dfc1fd5d8
Fix 'make dist' with new bundled BDB
2005-12-06 08:21:15 -08:00
pem@mysql.com
4dba0aa438
Merge mysql.com:/usr/home/pem/bug14233/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.1-new
2005-12-06 17:14:02 +01:00