petr@mysql.com
4a28ddac1c
fix for Bug #12849 Stored Procedure: Crash on procedure call with CHAR type 'INOUT' parameter
...
(recommit with the right Bug#)
2005-09-08 18:25:42 +02:00
tomas@poseidon.ndb.mysql.com
ffea32c6f3
corrected type
2005-09-08 16:51:35 +02:00
tomas@poseidon.ndb.mysql.com
4d534ae24e
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-09-08 15:59:06 +02:00
tomas@poseidon.ndb.mysql.com
a6c9ebba47
corrected printouts in backup test
2005-09-08 15:43:46 +02:00
tomas@poseidon.ndb.mysql.com
3979938c51
corrected prev fix for bug #13054
...
so that _only_ backup master replies to API
2005-09-08 15:24:21 +02:00
msvensson@neptunus.(none)
9c7d9c8fbb
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12717/my50-bug12717
2005-09-08 12:55:36 +02:00
hf@deer.(none)
4c6fb59243
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.12938
2005-09-08 15:55:35 +05:00
msvensson@neptunus.(none)
815941fd46
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12717/my50-bug12717
2005-09-08 12:18:09 +02:00
joerg@mysql.com
1db297fc2d
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-09-08 12:14:39 +02:00
msvensson@neptunus.(none)
08200d85ae
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12987/my50-bug12987
2005-09-08 11:55:01 +02:00
joerg@mysql.com
a88553ac55
Merge mysql.com:/M41/merge-4.1 into mysql.com:/M50/merge-5.0
2005-09-08 11:36:22 +02:00
msvensson@neptunus.(none)
60e3c3be0b
yassl fix for ia64 + icc
2005-09-08 11:36:12 +02:00
tomas@poseidon.ndb.mysql.com
0634542458
Bug #13054 start backup command return may be interrpted
2005-09-08 11:34:55 +02:00
hf@deer.(none)
9ccb36049b
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.12938
2005-09-08 14:34:01 +05:00
joerg@mysql.com
e240f59091
Merge mysql.com:/M40/clone-4.0 into mysql.com:/M41/merge-4.1
2005-09-08 11:12:05 +02:00
osku@127.(none)
1fd3dd53c3
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql/5.0/clean
2005-09-08 11:28:54 +03:00
osku@127.(none)
08126a3688
Merge 127.(none):/home/osku/mysql/5.0/clean
...
into 127.(none):/home/osku/mysql/5.0/12084
2005-09-08 11:27:13 +03:00
stewart@mysql.com
e55a6e7319
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug11607
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/bug11607
2005-09-08 15:11:56 +10:00
stewart@mysql.com
055a96814a
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
...
into mysql.com:/home/stewart/Documents/MySQL/4.1/bug11607
2005-09-08 15:06:01 +10:00
igor@rurik.mysql.com
04f3b5513a
item_sum.cc, item_sum.h:
...
Post-merge fix.
2005-09-07 21:38:27 -07:00
igor@rurik.mysql.com
6daec8eb6c
Manual merge
2005-09-07 18:07:51 -07:00
igor@rurik.mysql.com
80484114d4
Manual merge
2005-09-07 18:06:14 -07:00
igor@rurik.mysql.com
1e6736b543
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-09-07 16:33:12 -07:00
hartmut@mysql.com
052e9262ee
Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-09-08 00:57:02 +02:00
hartmut@mysql.com
1e1872464b
Merge mysql.com:/home/hartmut/projects/mysql/dev/4.0
...
into mysql.com:/home/hartmut/projects/mysql/dev/4.1
2005-09-08 00:50:03 +02:00
aivanov@mysql.com
9c51a97e90
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/mysql-5.0
2005-09-07 23:44:23 +04:00
aivanov@mysql.com
7cc0639f59
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/alexi/mysql-4.1
2005-09-07 23:39:49 +04:00
evgen@moonbone.local
ff588b4732
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/12922-bug-5.0-mysql
2005-09-07 23:33:32 +04:00
evgen@moonbone.local
8b2f705aca
item.cc:
...
Fix for fix bug#12922.
2005-09-07 23:32:39 +04:00
anozdrin@mysql.com
c1e570a441
Fix for Bug#12995: Inside function "Table 't4' was not locked with LOCK TABLES"
...
Any form of HANDLER statement is forbidden from usage in stored procedures/functions.
2005-09-07 23:03:56 +04:00
evgen@moonbone.local
f2d6282f6b
Manual merge
2005-09-07 22:55:49 +04:00
evgen@moonbone.local
80c3a0b1b6
Fix bug #12922 if(sum(),...) with group from view returns wrong results
...
Fields of view represented by Item_direct_view_ref. When complex expression
such as if(sum()>...,...) is splited in simpler parts by refs was ignored.
Beside this direct ref doesn't use it's result_field and thus can't store
it's result in tmp table which is needed for sum() ... group.
All this results in reported bug.
Item::split_sum_func2() now converts Item_direct_view_ref to Item_ref to
make fields from view being storable in tmp table.
2005-09-07 22:38:36 +04:00
brian@zim.(none)
d15e92dc98
Merge zim.(none):/home/brian/mysql/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-09-07 10:43:22 -07:00
brian@zim.(none)
8a5c24536c
Small tweak for random read performance (we shouldn't always tell the OS that we will be doing a linear scan).
2005-09-07 10:30:06 -07:00
msvensson@neptunus.(none)
ae180d81d6
Bug #12987 yassl: Compilation of integer.cpp fails on OS X Tiger
2005-09-07 17:04:22 +02:00
aivanov@mysql.com
d6398c1aae
Merge mysql.com:/home/alexi/mysql-5.0
...
into mysql.com:/home/alexi/dev/mysql-5.0-0
2005-09-07 18:58:58 +04:00
aivanov@mysql.com
6ff3befd32
Merge mysql.com:/home/alexi/mysql-4.1
...
into mysql.com:/home/alexi/dev/mysql-4.1-0
2005-09-07 18:55:33 +04:00
aivanov@mysql.com
4b245a2803
join_outer.result, opt_range.cc, item_cmpfunc.cc:
...
Post merge changes
sql_yacc.yy:
Post merge changes
sql_select.cc:
Fixed bugs #12101 , #12102 : wrong calculation of not_null_tables()
for some expressions (post merge changes).
The function add_key_fields() is modified. There cannot be NOT before
BETWEEN/IN anymore. Rather Item_func_between/in objects can represent
now [NOT]BETWEEN/IN expressions.
2005-09-07 17:42:47 +04:00
tomas@poseidon.ndb.mysql.com
35012ac189
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-09-07 15:21:08 +02:00
bar@mysql.com
d261e1f5c5
Merge mysql.com:/usr/home/bar/mysql-4.1.b12611
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-09-07 16:32:15 +05:00
bar@mysql.com
a0ddff9c6e
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b12611
2005-09-07 16:29:53 +05:00
bar@mysql.com
33d1833994
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-09-07 16:13:57 +05:00
gluh@eagle.intranet.mysql.r18.ru
f077477dca
Fix for bug#12905 show fields from view behaving erratically with current database
...
use saved view db name in case of view
2005-09-07 16:11:53 +05:00
tomas@poseidon.ndb.mysql.com
6582ed64f0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-09-07 12:55:53 +02:00
tomas@poseidon.ndb.mysql.com
78eaeb6d81
Modified ndb log message on startup failure
2005-09-07 12:49:11 +02:00
gluh@eagle.intranet.mysql.r18.ru
01afb3390b
Fix for bug#11775 Variable character_set_system does not exist (sometimes).
...
Variable character_set_system is selectable now
More accurate error message results during
update of character_set_system and some other read only variables
2005-09-07 15:38:09 +05:00
bar@mysql.com
cd5cd2bf79
Merge mysql.com:/usr/home/bar/mysql-4.1.b12829
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-09-07 14:57:27 +05:00
msvensson@neptunus.(none)
03d10aeaca
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-07 10:47:22 +02:00
sergefp@mysql.com
83b5f1a338
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug12941
2005-09-07 12:13:12 +04:00
bar@mysql.com
2ff61bd697
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b12829
2005-09-07 13:12:29 +05:00
