sergefp@mysql.com
eac4388caf
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug12943
2005-09-09 10:08:46 +04:00
serg@serg.mylan
819db2471c
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-09-09 01:04:54 +02:00
igor@rurik.mysql.com
6bbdd66e89
olap.result, olap.test:
...
Added a test case with VIEW for bug #12885 .
2005-09-08 15:45:31 -07:00
patg@radha.local
06d1582b98
BUG #12597 This is a complete patch (2nd) containing fixes per Serg's review
2005-09-09 00:03:07 +02:00
serg@serg.mylan
7e9646f05d
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-09-08 23:11:15 +02:00
serg@serg.mylan
a7f2179c29
BUG#12695: Item_func_isnull::update_used_tables did not update const_item_cache
2005-09-08 22:57:27 +02:00
igor@rurik.mysql.com
b2f0f9085f
Manual merge
2005-09-08 13:45:49 -07:00
igor@rurik.mysql.com
bcae525685
Manual merge
2005-09-08 13:44:36 -07:00
patg@radha.local
4171c7435a
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056
2005-09-08 22:29:13 +02:00
igor@rurik.mysql.com
19192328f2
sql_select.cc:
...
Fixed bug #12885 .
Forced inheritence of the maybe_null flag for the expressions
containing GROUP BY attributes in selects with ROLLUP.
olap.test, olap.result:
Added test case for bug #12885 .
2005-09-08 12:37:16 -07:00
andrey@lmy004.
1a46ea1057
fix for bug #12651 (item of a prepared query allocated on non-permanent
...
are thus dangling later)
2005-09-08 21:30:05 +02:00
timour@mysql.com
13d8179157
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-09-08 21:02:19 +03:00
patg@radha.local
4cb63e6b8b
BUG #9056 Changes to patch #2 per Serg's review
2005-09-08 19:45:25 +02:00
acurtis@xiphis.org
e3972e23bb
Bug#10586
...
regression test
2005-09-08 18:15:05 +01:00
timour@mysql.com
818e2a3e89
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-09-08 19:52:47 +03:00
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
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
timour@mysql.com
7fc6216e73
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-09-08 11:32:14 +03:00
timour@mysql.com
912aef9579
Fix for BUG#12977.
2005-09-08 11:29:52 +03: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
SergeyV@selena.
95b5f7de0f
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into selena.:H:/MYSQL/src/#12517-mysql-4.1
2005-09-08 12:12:21 +04:00
SergeyV@selena.
668f0e10fa
Modified test case for bug #12517
2005-09-08 12:09:30 +04: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
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
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
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
sergefp@mysql.com
e5b4252481
Fix for BUG#12637: Make SPs+user variables replication work:
...
* Allocate thd->user_var_events elements on appropriate mem_root
* If several SP statements are binlogged as a single statement, collect all user var
accesses they make (grep for StoredRoutinesBinlogging for details)
2005-09-07 19:39:47 +04: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
msvensson@neptunus.(none)
cb3d610148
BUG#12984 mysqltest.test: different output from "exec NonExistsinfComamdn"
...
- Improved solution
2005-09-07 16:39:16 +02: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
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
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
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
sergefp@mysql.com
99870f616d
Fix for BUG#12941: in create_tmp_field(), if the passed item is an Item_ref, put newly
...
created item into item->result_field, not *(item->ref)->result_field.
2005-09-07 11:50:41 +04:00
igor@rurik.mysql.com
af9740d0fd
func_gconcat.result, func_gconcat.test:
...
Added test cases for bug #12863 .
item_sum.cc, item_sum.h:
Fixed bug #12863 .
Added a flag to Item_func_group_concat set to FALSE after
concatenation of the first element of a group.
2005-09-06 22:20:11 -07:00
bell@sanja.is.com.ua
e3ce1a6171
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0
2005-09-07 00:19:59 +03:00
msvensson@neptunus.(none)
5c8d457ec8
Backport fixes for mysqltest.test from 5.0
2005-09-06 22:03:12 +02:00
aivanov@mysql.com
2165167200
Merge mysql.com:/home/alexi/dev/mysql-4.1-0
...
into mysql.com:/home/alexi/dev/mysql-5.0-0
2005-09-06 23:49:54 +04:00
eric@mysql.com
289bdcffa9
Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/eric/bktmp/mysql-5.0
2005-09-06 11:04:36 -07:00
bell@sanja.is.com.ua
352c7b9cbc
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0
2005-09-06 20:51:15 +03:00