database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-18 07:48:43 +03:00
Code Activity
32,379 Commits 3,279 Branches 1,097 Tags
36e06f6372a95f65512c79ac078949b92eb5cc96
Commit Graph

15275 Commits

Author SHA1 Message Date
mskold@mysql.com
3b4422aa1e Added more debugging printouts 2006-03-29 13:13:39 +02:00
msvensson@shellback.
14e30f4773 Manual merge 2006-03-29 12:09:37 +02:00
msvensson@shellback.
1d30dfdc00 Remove unused variable 2006-03-28 19:34:44 +02:00
msvensson@shellback.
d670ba1e8d Declare innobase "srv_*" variables as extern "C" 2006-03-28 19:27:38 +02:00
reggie@linux.site
8c0c94af46 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/reggie/work/mysql-5.1
 2006-03-28 11:12:59 -06:00
reggie@big_geek.
4a166c2f2f some simple CMAKE updates 2006-03-28 10:05:25 -06:00
bar@mysql.com
500e9946d7 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-03-28 20:09:07 +05:00
reggie@linux.site
f8ed047376 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/reggie/work/mysql-5.1
 2006-03-28 09:09:06 -06:00
reggie@linux.site
6f4a3685da restored handlerton-win.cc that I mistakenly deleted. 2006-03-28 09:05:23 -06:00
knielsen@mysql.com
4c87c8dc54 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/mysql/tmpbuild
 2006-03-28 16:35:50 +02:00
bar@mysql.com
b56bc04c7d Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-03-28 18:24:04 +05:00
gluh@mysql.com
15ecaa1866 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
 2006-03-28 17:26:45 +05:00
gluh@eagle.intranet.mysql.r18.ru
9c82b6746a Bug#18053 Partitions: crash if null 
Bug#18070 Partitions: wrong result on WHERE ... IS NULL
 removed unnecessary code
 added handling of NULL values
 2006-03-28 17:25:19 +05:00
bar@mysql.com
29b8e09732 Merge mysql.com:/usr/home/bar/mysql-4.1.b15098 
into  mysql.com:/usr/home/bar/mysql-5.0
Bug#15098
 2006-03-28 17:07:26 +05:00
knielsen@mysql.com
3f2cc44b3d Clean up CMake configuration following review. 2006-03-28 13:49:29 +02:00
mskold@mysql.com
cd557bf495 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-03-28 13:28:34 +02:00
tomas@poseidon.ndb.mysql.com
b25045beb4 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-28 11:47:49 +02:00
mskold@mysql.com
37a6167d6d Post review fix for Bug #15722 Engine_condition_pushdown fails when using blobs(text) 2006-03-28 11:46:35 +02:00
knielsen@mysql.com
cc57e4e01b Manual merge. 2006-03-28 10:07:03 +02:00
mskold@mysql.com
c76ab0a4f6 Fix for Bug #15722 Engine_condition_pushdown fails when using blobs(text) 2006-03-28 09:59:20 +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
igor@rurik.mysql.com
df80048d5f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rurik.mysql.com:/home/igor/mysql-5.0
 2006-03-27 20:16:52 -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
tomas@poseidon.ndb.mysql.com
3fbcdb5dcc removed rpl_ndb_sp007 test as it uses savepoints which is only supported by innodb 
compile error fixes
 2006-03-27 19:41:37 +02: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