database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-20 13:13:59 +03:00
Code
30,150 Commits 2,993 Branches 353 Tags
Commit Graph

9884 Commits

Author SHA1 Message Date
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
tomas@poseidon.ndb.mysql.com
8e0f803671 updated ndb restore test prog to work better with wl2325 2005-09-15 15:50:08 +02:00
bell@sanja.is.com.ua
630cdd7d0c Information schema fix for WL#2787 2005-09-15 11:56:06 +03:00
ndbdev@dl145c.mysql.com
dc595c9b1d merge 2005-09-15 07:36:47 +02:00
pekka@mysql.com
81d8cc1e84 ndb - wl#2624 re-commit due to bk problem 2005-09-15 02:33:28 +02: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
ndbdev@dl145c.mysql.com
44a6b536d2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-09-15 00:16:37 +02:00
pappa@c-0d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
b636832ba1 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  c-0d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
 2005-09-14 18:16:36 -04:00
pappa@c-0d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
1494ef61c7 Bug #13154: 
Used AND when modulo should have been used to calculate partition id
for PARTITION BY KEY and SUBPARTITION BY KEY
 2005-09-14 18:15:40 -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
ea4161baed merge 2005-09-14 17:58:20 +02:00
tulin@dl145c.mysql.com
b127139206 Bug #13179 partition info in mysqldump makes it hard to use dump in different sized cluster 2005-09-14 17:30:23 +02: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
cde15356a8 Merge dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-09-14 15:49:08 +02: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
joerg@mysql.com
734895c73c Merge mysql.com:/M50/upward-5.0 into mysql.com:/M51/merge-5.1 2005-09-14 15:05:01 +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
80da104ea5 merge 2005-09-14 13:37:52 +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
joerg@mysql.com
eee616d122 Minor output format change of the Perl test suite script (align with the shell script). 2005-09-14 13:12:30 +02:00
petr@mysql.com
c1348ec13a Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
 2005-09-14 14:54:48 +04:00
bell@sanja.is.com.ua
4a18f890e6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
 2005-09-14 13:37:40 +03:00
tulin@dl145c.mysql.com
415ec2bf89 Bug #13152 bit fields and fileds that follow become corrupted when dumped from NDB tables 2005-09-14 11:41:36 +02:00
bell@sanja.is.com.ua
9388f7277c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
 2005-09-14 12:26:09 +03:00
bell@sanja.is.com.ua
3f160eed87 postmerge fix 2005-09-14 12:24:14 +03:00
pem@mysql.com
f698d25b3a Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.0
 2005-09-14 10:54:52 +02:00
pem@mysql.com
9cf77e404e Post-review fix for BUG#12712: SET AUTOCOMMIT should fail within SP/functions/triggers 2005-09-14 10:54:02 +02:00
petr@mysql.com
d019da7dd8 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
 2005-09-14 12:42:23 +04:00
bell@sanja.is.com.ua
914b961d01 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
 2005-09-14 11:07:04 +03:00
bell@sanja.is.com.ua
71ffbbf81b part 1 (ver 2, postreview fix) of WL#2787 
view definer information syntax/storage/replication
fixed SOURCE field of .frm
 2005-09-14 10:53:09 +03:00