mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 22:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32323 commits 2781 branches 343 tags 1.6 GiB
Commit graph

15254 commits

Author SHA1 Message Date
knielsen@mysql.com
3f2cc44b3d Clean up CMake configuration following review. 2006-03-28 13:49:29 +02:00
knielsen@mysql.com
cc57e4e01b Manual merge. 2006-03-28 10:07:03 +02:00
igor@rurik.mysql.com
8cb3cf2382 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-03-27 20:26:57 -08:00
ian@zim.(none)
9caff206c2 Merge zim.(none):/home/ian/workspace/mysql-5.0 
into  zim.(none):/home/ian/workspace/mysql-5.1-new

Updated bug message in disabled file -Brian
 2006-03-27 19:48:44 -08:00
igor@rurik.mysql.com
22d66dccd6 Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-03-27 18:30:40 -08:00
igor@rurik.mysql.com
f57e0b3db7 Fixed bug #18386. 
An invalid assertion in Item_direct_view_ref::eq caused 
an assertion abort in the debug version.
 2006-03-27 18:28:55 -08:00
brian@zim.(none)
1ec1587cd3 Removing deleted file (this fixes the pushbuild failure from Reggie's push). 
There still may be issues on the Window's side from what I can see from doing a grep.
 2006-03-27 18:20:43 -08:00
reggie@big_geek.
7f674749b8 removed handlerton-win.cc 
now using CONFIGURE_FILE and INCLUDE to generate handlerton.cc and to set the definitions based on
the storage engines given on the command line
 2006-03-27 15:19:56 -06:00
anozdrin@mysql.com
cc1ee7e48b Fix for BUG#15921: DROP TRIGGER - can't be drop trigger created 
in older version.

The problem is that TRN-files created in "old" versions contain
junk in trigger_table field, which is not acceptable in "new" versions.
 2006-03-28 01:01:51 +04:00
brian@zim.(none)
cafbe1ec29 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-03-26 01:35:45 -08:00
brian@zim.(none)
f940472d5a Fix to remove engine dependency from handler.cc file, the last one for functions. 2006-03-26 01:32:52 -08:00
dlenev@mysql.com
e7d2b09e14 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/dlenev/mysql-5.1-merges
 2006-03-25 19:03:09 +03:00
igor@rurik.mysql.com
ec4910c413 Merge rurik.mysql.com:/home/igor/mysql-5.1 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-03-24 15:24:06 -08:00
dlenev@mysql.com
880d1ccd64 Merge mysql.com:/home/dlenev/mysql-5.0-bg18153 
into  mysql.com:/home/dlenev/mysql-5.1-merges
 2006-03-25 02:24:05 +03:00
dlenev@mysql.com
8643070cda Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/dlenev/mysql-5.1-merges
 2006-03-25 02:24:04 +03:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
24897407d6 BUG#16806: ALTER TABLE with new field in before position fails 
Review fixes
 2006-03-24 18:21:43 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
4362a7a1b6 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
 2006-03-24 17:34:12 -05:00
knielsen@mysql.com
bc6628d27f Some changes to make it possible to build for Windows with CMake from 
a normal 'make dist' source .tar.gz.
 2006-03-24 22:50:56 +01:00
igor@rurik.mysql.com
1fd7f10952 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-03-24 12:56:31 -08:00
igor@rurik.mysql.com
69eb4e6932 Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-03-24 12:46:33 -08:00
igor@rurik.mysql.com
e99247775a Fixed bug #17164. 
If the WHERE condition of a query contained an ORed FALSE term
then the set of tables whose rows cannot serve for null complements
in outer joins was determined incorrectly. It resulted in blocking 
possible conversions of outer joins into joins for such queries.
 2006-03-24 12:44:54 -08:00
dlenev@mysql.com
4d1d8ed335 Follow-up for the fix for bug #18153 "ALTER/OPTIMIZE/REPAIR on transactional 
tables corrupt triggers".

It turned out that we also have relied at certain places that
(new_table != table_name) were always true on Windows and for transactional
tables. Since our fix for the bug brakes this assumption we have to add new
flag to pass this information around.
This code needs to be refactored but I dare not to do this in 5.0.
 2006-03-24 22:46:33 +03:00
dlenev@mysql.com
3205f00449 Merge mysql.com:/home/dlenev/mysql-5.0-bg18153 
into  mysql.com:/home/dlenev/mysql-5.1-merges
 2006-03-24 19:46:01 +03:00
dlenev@mysql.com
e5d5196586 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/mysql-5.0-bg18153
 2006-03-24 16:46:37 +03:00
msvensson@neptunus.(none)
5a5afadcb4 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-24 13:56:05 +01:00
msvensson@neptunus.(none)
31e04d4571 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-24 13:55:10 +01:00
msvensson@neptunus.(none)
3dd641bd5c Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-24 13:50:41 +01:00
dlenev@mysql.com
ec96a87912 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/mysql-5.0-bg18153
 2006-03-24 15:28:08 +03:00
dlenev@mysql.com
891e9424f2 Fix for bug #18153 "ALTER/OPTIMIZE/REPAIR on transactional tables corrupt 
triggers".

Applying ALTER/OPTIMIZE/REPAIR TABLE statements to transactional table or to
table of any type on Windows caused disappearance of its triggers.
Bug was introduced in 5.0.19 by my fix for bug #13525 "Rename table does not
keep info of triggers" (see comment for sql_table.cc for more info).
.
 2006-03-24 14:58:18 +03:00
msvensson@neptunus.(none)
ab1f95df3e Merge 192.168.0.100:mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-24 12:33:11 +01:00
knielsen@mysql.com
443ac64226 Improved fix for HPUX compile failure. 2006-03-24 12:24:31 +01:00
msvensson@shellback.(none)
6a6d305540 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-24 12:02:39 +01:00
msvensson@devsrv-b.mysql.com
95d2706e32 Fix 'metaphon' function to correctly calculate the length of the returned string 2006-03-24 11:12:32 +01:00
mskold@mysql.com
6272ddc173 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2006-03-24 10:52:44 +01:00
mskold@mysql.com
a444f0a3ae 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-03-24 10:48:28 +01:00
mskold@mysql.com
1bb473c3ab If doing write, then peeking is not needed 2006-03-24 10:45:00 +01:00
mskold@mysql.com
7015003c3e Fix for Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted' 2006-03-24 10:42:55 +01:00
tomas@poseidon.ndb.mysql.com
d0a3ce5da4 - corrected bug causing hang in getTable when using blob tables 
- make sure cluster/schema table is always created first
 2006-03-24 10:12:34 +01:00
msvensson@shellback.(none)
0568175984 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-24 07:25:14 +01:00
brian@zim.(none)
8eab1ba028 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-03-23 15:04:45 -08:00
tomas@poseidon.ndb.mysql.com
5cc1da5424 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-03-23 22:50:20 +01:00
tomas@poseidon.ndb.mysql.com
57198f85d6 Bug #18472 race condition between multiple mysqld's when setting up cluster/schema 
- check that event is the correct one, and only delete if wrong version
 2006-03-23 22:49:02 +01:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
0edc061543 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
 2006-03-23 16:02:20 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
2d2bd9fe7a BUG #16806: ALTER TABLE fails when creating new field not last in table 
Moved some code to else path to avoid delete, create, delete, create scenarios.
Fixed up the partition info object for some cases where we move from default
partitioning in NDB to default partitioning using partitioning.
 2006-03-23 16:00:58 -05:00
msvensson@devsrv-b.mysql.com
1b3c22b459 Remove DBUG print that looks at args[0] even if arg_count is 0 2006-03-23 21:45:00 +01:00
msvensson@shellback.(none)
4602e426dc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-23 18:58:53 +01:00
msvensson@shellback.(none)
b5bea5e312 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-23 18:14:02 +01:00
brian@zim.(none)
9fc9d0f282 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-03-23 08:46:26 -08:00
bar@mysql.com
add4b40ebe Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-03-23 19:59:21 +04:00
knielsen@mysql.com
a3ad39cf66 Updated CMake stuff to handle the configurations needed for release 
builds.
 2006-03-23 16:34:52 +01:00