mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-08 04:03:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33437 commits 2857 branches 349 tags 1.6 GiB
Commit graph

33437 commits

Author SHA1 Message Date
konstantin@mysql.com
ba845055f9 Merge mysql.com:/opt/local/work/tmp_merge 
into  mysql.com:/opt/local/work/mysql-5.1-merge
 2006-04-23 04:04:36 +04:00
Magnus@hugo.
0f51bcc35d Fix windows compile problem 2006-04-22 13:29:05 +02:00
andrey@lmy004.
1b6c3944f4 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-new-clean
 2006-04-22 11:38:23 +03:00
elliot@mysql.com
ffe003eb5c Post merge fix. 2006-04-22 04:38:22 -04:00
elliot@mysql.com
3b1a22ba8e Merge mysql.com:/home/emurphy/src/mysql/bk-clean/tmp_merge 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge
 2006-04-22 04:38:21 -04:00
elliot@mysql.com
a1cf352115 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge
 2006-04-22 04:38:20 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
33eccd0c1e WL 2826: Error handling of ALTER TABLE for partitioning 
Fixed merge issue
 2006-04-22 04:38:19 -04:00
dlenev@mysql.com
5e7076ce95 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/dlenev/mysql-5.0-bg15153-2
 2006-04-22 11:56:15 +04:00
dlenev@mysql.com
c77d5a0ed1 Fix for bug#15153 "CONVERT_TZ() is not allowed in all places in VIEWs". 
Error was emitted when one tried to select information from view which used
merge algorithm and which also had CONVERT_TZ() function in its select list.

This bug was caused by wrong assumption that global table list for view
which is handled using merge algorithm begins from tables belonging to
the main select of this view. Nowadays the above assumption is not true only
when one uses convert_tz() function in view's select list, but in future
other cases may be added (for example we may support merging of views
with subqueries in select list one day). Relying on this false assumption
led to the usage of wrong table list for field lookups and therefor errors. 

With this fix we explicitly use pointer to the beginning of main select's
table list.
 2006-04-22 11:54:25 +04:00
elliot@mysql.com
35041a35bd Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge
 2006-04-21 21:04:43 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
865f533c2d Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
 2006-04-21 21:04:42 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
fd799cf6f5 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
 2006-04-21 16:26:34 -04:00
joerg@mysql.com
19b0b3c62b Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2006-04-21 22:09:21 +02:00
elliot@mysql.com
3d79db975f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge
 2006-04-21 14:26:27 -04:00
kent@mysql.com
806564d754 innodb_unsafe_binlog-master.opt: 
Make InnoDB option "loose", as the server might be
  started with this option just to find out the test
  is to be skipped in the configuration (bug#17359)
 2006-04-21 20:24:52 +02:00
elliot@mysql.com
c13fc693fe After merge fixes. 2006-04-21 14:21:17 -04:00
kent@mysql.com
1472ed2061 Merge 2006-04-21 20:04:13 +02:00
andrey@lmy004.
c10865e929 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-new-clean
 2006-04-21 20:49:54 +03:00
elliot@mysql.com
b02185c5bd Merge mysql.com:/home/emurphy/src/mysql/bk-clean/tmp_merge2 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge
 2006-04-21 13:20:15 -04:00
igor@rurik.mysql.com
4b21910b0d Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rurik.mysql.com:/home/igor/mysql-5.0
 2006-04-21 09:46:47 -07:00
tomas@poseidon.ndb.mysql.com
6013082977 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-04-21 18:31:17 +02:00
jimw@mysql.com
5ec058229a Delete some more NDB cruft. 2006-04-21 09:30:16 -07:00
tomas@poseidon.ndb.mysql.com
cdb5fada29 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-21 18:30:15 +02:00
tomas@poseidon.ndb.mysql.com
7bbf39cd0f ndb: minor modification in replication timer code 
added missing setting of latest applied epoch
 2006-04-21 18:28:00 +02:00
tomas@poseidon.ndb.mysql.com
590c8cfc1d disabled.def cleanup 2006-04-21 17:28:45 +02:00
igor@rurik.mysql.com
510ab81362 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  rurik.mysql.com:/home/igor/mysql-4.1
 2006-04-21 08:22:03 -07:00
igor@rurik.mysql.com
639e875032 Post merge fixes 2006-04-21 08:19:38 -07:00
kroki@mysql.com
b0c1e49a11 Bug#15728: LAST_INSERT_ID function inside a stored function returns 0 
Do not reset value of LAST_INSERT_ID() in sub-statement.
 2006-04-21 18:55:04 +04:00
tomas@poseidon.ndb.mysql.com
e38f6bc590 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-21 16:42:31 +02:00
tomas@poseidon.ndb.mysql.com
b665ee5796 Merge jonas@perch:src/51-work/ 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-21 16:34:51 +02:00
tomas@poseidon.ndb.mysql.com
47e831ca1f added skip create option to bank test program 2006-04-21 16:05:42 +02:00
mskold@mysql.com
d3e92df944 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb
 2006-04-21 15:57:52 +02:00
jonas@perch.ndb.mysql.com
34f4301cd9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-04-21 15:36:11 +02:00
tomas@poseidon.ndb.mysql.com
0bdfbfe8da Bug ndb: restore of ndb backup from different endian does not work 
+ removed not needed --
 2006-04-21 15:36:10 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
fa3c74b420 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
 2006-04-21 09:30:05 -04:00
joerg@mysql.com
668d083653 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2006-04-21 15:20:10 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
4d0a4e1199 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
 2006-04-21 08:57:53 -04:00
mskold@mysql.com
48c3a9ea76 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-21 14:55:02 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
dc8a0bd64d Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962
 2006-04-21 08:55:01 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
fe46ee9111 BUG#18962: Crash of ALTER TABLE .. DROP PARTITION ... 
Review fixes
 2006-04-21 08:37:09 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
6473c10445 WL 2826: Error handling of ALTER TABLE for partitioning 
Final review fixes
 2006-04-21 08:35:25 -04:00
pem@mysql.com
8532fa29f4 Post-push fix for BUG#18344: DROP DATABASE does not drop associated routines 
Fixed windows compile error in sql/sp.cc (missing cast to byte*)
 2006-04-21 14:30:44 +02:00
jonas@perch.ndb.mysql.com
03694f887d Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-04-21 14:15:54 +02:00
jonas@perch.ndb.mysql.com
938b9f0e2f ndb - 
bug#19141, bug#18575
  
  Maek sure global dict lock is taken during create/drop file/filegroup
 2006-04-21 14:13:19 +02:00
tomas@poseidon.ndb.mysql.com
77e3fc3a09 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-04-21 14:02:21 +02:00
tomas@poseidon.ndb.mysql.com
fe67d648fc Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-21 14:00:44 +02:00
jonas@perch.ndb.mysql.com
6673d7ca5a ndb - 
Fix error handling when out of diskspace
 2006-04-21 13:58:55 +02:00
ramil@production.mysql.com
aed861fd86 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  production.mysql.com:/usersnfs/rkalimullin/4.1.b18643
 2006-04-21 13:56:40 +02:00
tomas@poseidon.ndb.mysql.com
f071779791 Bug Can't change character-sets-dir for ndbd 2006-04-21 13:53:48 +02:00
tomas@poseidon.ndb.mysql.com
7dbc18bd07 ndb: corrected install dir 
ndb: corrected initialization of records
 2006-04-21 13:51:58 +02:00