sasha@asksasha.com
c4f16269f3
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139
2005-09-19 15:45:01 -06:00
evgen@moonbone.local
9fe540fa13
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/13218-bug-4.1-mysql
2005-09-19 23:46:39 +04:00
kent@mysql.com
654277084c
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-09-19 15:31:09 +02:00
kent@mysql.com
76956fdf90
mysql-test-run.pl:
...
Added flag --valgrind-mysqltest
2005-09-19 14:58:06 +02:00
kent@mysql.com
cfba073cc4
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-09-19 12:31:22 +02:00
bar@mysql.com
d7f96c50ae
ctype_utf8.result, ctype_utf8.test:
...
Bug#10504: additional test
2005-09-19 09:48:03 +05:00
bar@mysql.com
6424e9cce1
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b10504
2005-09-19 09:46:25 +05:00
georg@lmy002.wdf.sap.corp
541d3ae89b
Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0-master
2005-09-19 05:32:38 +02:00
evgen@moonbone.local
afa8187fb7
Fix bug #13218 : InnoDB: using a partial-field key prefix in search
...
This is backport from 5.0 of fix for bug #11039
2005-09-19 04:39:49 +04:00
sasha@asksasha.com
c87bc3ef64
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139
2005-09-17 18:46:54 -06:00
eric@mysql.com
a4aa8fb9b2
Added testcase for BUG#13118
2005-09-16 16:17:44 -07:00
kent@mysql.com
60bc49cf78
mysql-test-run.pl:
...
Enabled --valgrind to work (bug#13280)
2005-09-17 01:09:32 +02:00
georg@lmy002.wdf.sap.corp
afe8dcf2e7
Fix for bug#5508 after Sanja's review
2005-09-16 17:13:21 +02:00
evgen@moonbone.local
72f530ef3d
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/12291-bug-5.0-mysql
2005-09-16 16:08:11 +04:00
bell@sanja.is.com.ua
c5ff0d6953
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
2005-09-16 09:20:00 +03:00
bell@sanja.is.com.ua
27aa2ae30c
fixed length detection
2005-09-16 09:15:45 +03:00
bar@mysql.com
1d12ac8849
Bug#10504
...
Character set does not support traditional mode
ctype_utf8.result, ctype_utf8.test:
adding test case.
password.c, mysql_com.h
Changeing octet2hex availability from static to public.
item_strfunc.cc:
Result string is now checked to be well-formed.
Warning/error is generated, depending on sql_mode.
2005-09-16 10:24:37 +05:00
evgen@moonbone.local
097ca8ad90
Fix bug #12291 Table wasn't reinited for index scan after sequential scan
...
Optimizer did choose "Range checked for each record" for one of the tables.
For first few loops over that table it choose sequential access, on later
stage it choose to use index. Because table was previously initialized for
sequential access, it skips intitialization for index access, and when
server tries to retrieve data error occurs.
QUICK_RANGE_SELECT::init() changes so if file already initialized for
sequential access, it calls ha_rnd_end() and initializes file for index
access.
2005-09-16 01:19:43 +04:00
bell@sanja.is.com.ua
aec371f910
WL#2787 (part 2, ver 3 (merged)) changed securety context switching
2005-09-15 22:29:07 +03:00
evgen@moonbone.local
7de902fcef
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/12887-bug-5.0-mysql
2005-09-15 23:22:07 +04:00
serg@serg.mylan
bd3b8a495e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-15 21:09:33 +02:00
serg@serg.mylan
db896a66ca
bad merge fixed
2005-09-15 21:05:42 +02:00
evgen@moonbone.local
3065cc0edf
Manual merge
2005-09-15 22:21:30 +04:00
evgen@moonbone.local
dbfc28cec1
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/12887-bug-4.1-mysql
2005-09-15 21:34:53 +04:00
evgen@moonbone.local
1685040e2b
Fix bug#12887 Distinct is not always applied after rollup
...
For queries with GROUP BY and without hidden GROUP BY fields DISTINCT is
optimized away becuase such queries produce result set without duplicates.
But ROLLUP can add rows which may be same to some rows and this fact was
ignored.
Added check so if ROLLUP is present DISTINCT can't be optimized away.
2005-09-15 21:34:11 +04:00
evgen@moonbone.local
d693323b69
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/11416-bug-5.0-mysql
2005-09-15 21:24:41 +04:00
evgen@moonbone.local
fcfcc016bd
Merge
2005-09-15 20:50:10 +04:00
bell@sanja.is.com.ua
630cdd7d0c
Information schema fix for WL#2787
2005-09-15 11:56:06 +03:00
dlenev@mysql.com
2a96aa110f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg12704-2
2005-09-15 03:57:59 +04:00
dlenev@mysql.com
e231ebe5fb
Fix for bug #12704 "Server crashes during trigger execution".
...
This bug occurs when some trigger for table used by DML statement is created
or changed while statement was waiting in lock_tables(). In this situation
prelocking set which we have calculated becames invalid which can easily lead
to errors and even in some cases to crashes.
With proposed patch we no longer silently reopen tables in lock_tables(),
instead caller of lock_tables() becomes responsible for reopening tables and
recalculation of prelocking set.
2005-09-15 03:56:09 +04:00
sasha@asksasha.com
b6414f7993
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139
2005-09-14 15:19:56 -06:00
elliot@mysql.com
f3030c3411
Updated test results for view test.
2005-09-14 16:27:55 -04:00
elliot@mysql.com
588af40cda
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
2005-09-14 16:16:04 -04:00
bell@sanja.is.com.ua
87a8fb4807
fixed portability
2005-09-14 23:12:01 +03:00
evgen@moonbone.local
ac32450609
Fix bug #11416 Server crash if using a view that uses function convert_tz
...
When parser parses function convert_tz it loads available timezone tables in
thd->lex->time_zone_tables_used. But view have another lex that main query.
Thus time_zone_tables_used of main query left uninitialized.
When Item_func_conver_tz is fixed it takes timezone tables from main query
and later when it executed it assumes that timezone tables are loaded and
failed that assertion.
2005-09-15 00:08:12 +04:00
elliot@mysql.com
86882cc8f9
Merge mysql.com:/home/emurphy/src/work/mysql-5.0-bug-12870
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
2005-09-14 14:44:48 -04:00
elliot@mysql.com
8e7e17166c
BUG#12870 (CREATE PROCEDURE followed by ROLLBACK is not replicated)
...
Fixed by making CREATE/ALTER/DROP PROCEDURE cause implicit commit.
2005-09-14 14:42:39 -04:00
aivanov@mysql.com
a42b5000ca
Merge mysql.com:/home/alexi/mysql-5.0
...
into mysql.com:/home/alexi/dev/mysql-5.0-13000
2005-09-14 20:32:59 +04:00
aivanov@mysql.com
53e90b53bc
Fixed BUG#12963, BUG#13000: wrong VIEW creation with DAYNAME(),
...
DAYOFWEEK(), and WEEKDAY().
2005-09-14 20:25:00 +04:00
tulin@dl145c.mysql.com
129c98179b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
2005-09-14 17:27:01 +02:00
bell@sanja.is.com.ua
d1c4241aa5
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
2005-09-14 17:28:28 +03:00
bell@sanja.is.com.ua
2fce07b08b
postmerge fix
2005-09-14 17:27:33 +03:00
tulin@dl145c.mysql.com
e1383ab4c4
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
2005-09-14 15:47:15 +02:00
tulin@dl145c.mysql.com
a8eb0f176b
enabled mysqldump hex-blob option for bit fields
2005-09-14 15:46:31 +02:00
joerg@mysql.com
49f8424f6c
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-09-14 15:24:52 +02:00
sasha@asksasha.com
a9a612f1b6
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139
2005-09-14 06:37:52 -06:00
joerg@mysql.com
3d457c3ba1
Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0
2005-09-14 14:34:45 +02:00
sasha@asksasha.com
00eae49b5c
fix for BUG#11139 (multi-delete with alias breaking replication if table rules are
...
present): the problem originally was that the tables in auxilliary_tables did not have
the correct real_name, which caused problems in the second call to tables_ok().
The fix corrects the real_name problem, and also sets the updating flag properly,
which makes the second call to tables_ok() unnecessary.
2005-09-14 06:31:38 -06:00
joerg@mysql.com
b4d4e7a306
Improve error / process handling in the Perl script to run the test suite (patch supplied by Kent).
2005-09-14 13:55:53 +02:00
tulin@dl145c.mysql.com
f1e6ee04bc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
2005-09-14 13:27:57 +02:00