mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
30793 commits 2793 branches 343 tags 1.7 GiB
Commit graph

10428 commits

Author SHA1 Message Date
mskold@mysql.com
22334907fc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-06-21 12:03:08 +02:00
mskold@mysql.com
f0bd8a7cd9 Merge mysql.com:/home/marty/MySQL/mysql-5.0-backed 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-06-21 09:50:41 +02:00
mskold@mysql.com
e77850e573 Fix for Bug #19906 REPLACE doesn't update TEXT fields correctly 2006-06-21 09:36:50 +02:00
ramil@mysql.com
81277475f8 Merge mysql.com:/usr/home/ram/work/mysql-4.1 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2006-06-21 09:16:22 +05:00
evgen@moonbone.local
8c0aa3560c field.cc, field.h: 
Additional fix for #16377 for bigendian platforms
sql_select.cc, select.result, select.test:
  After merge fix
 2006-06-21 01:14:53 +04:00
evgen@moonbone.local
278b26a39b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-21 01:10:59 +04:00
evgen@moonbone.local
52d86dff85 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-06-20 23:49:33 +04:00
evgen@moonbone.local
bb53b6eeaa Manually merged 2006-06-20 23:22:51 +04:00
evgen@moonbone.local
ae6970e6bc select.result: 
Added test case for bug#18759 Incorrect string to numeric conversion.  
select.test:
  Added test case for bug#18759 Incorrect string to numeric conversion.
item_cmpfunc.cc:
  Cleanup after fix for bug#18360 removal
 2006-06-20 23:05:55 +04:00
evgen@moonbone.local
1e0138fd3d Manually merged 2006-06-20 22:22:14 +04:00
elliot@mysql.com
37e5ec9f50 Applying patch from SergeyV 
Fixes bug#17264, for alter table on win32 for successfull operation completion
it is used TL_WRITE(=10) lock instead of TL_WRITE_ALLOW_READ(=6), however here
in innodb handler TL_WRTIE is lifted to TL_WRITE_ALLOW_WRITE, which causes
race condition when several clients do alter table simultaneously.
 2006-06-20 13:43:13 -04:00
evgen@sunlight.local
d0d32f7d11 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into sunlight.local:/home/evgen/tmp_merge-5.0-opt-mysql
 2006-06-20 15:44:33 +04:00
evgen@moonbone.local
314b897fbf func_time.result: 
After merge fix
 2006-06-20 15:35:54 +04:00
ramil@mysql.com
d1fcc620d8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/mysql-4.1
 2006-06-20 09:35:25 +05:00
lars@mysql.com
cf2b170d00 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-06-20 00:08:12 +02:00
evgen@moonbone.local
217faf569e Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-06-20 02:04:36 +04:00
evgen@moonbone.local
609e0dbd99 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-06-20 01:56:33 +04:00
evgen@moonbone.local
de8f05956d Merge 2006-06-20 00:52:26 +04:00
evgen@moonbone.local
279c310b66 item_cmpfunc.cc, func_in.result, func_in.test: 
Reverted fix for bug#18360
 2006-06-20 00:50:09 +04:00
anozdrin@mysql.com
e420873370 Merge mysql.com:/home/alik/MySQL/devel/5.0-rt 
into  mysql.com:/home/alik/MySQL/devel/5.0-tree-merged
 2006-06-19 18:10:04 +04:00
anozdrin@mysql.com
4afffb40a8 Merge mysql.com:/home/alik/MySQL/devel/5.0-tree 
into  mysql.com:/home/alik/MySQL/devel/5.0-rt
 2006-06-19 16:57:46 +04:00
lars@mysql.com
ad809c6b15 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-06-19 13:30:54 +02:00
lars@mysql.com
67e476f29f BUG#17201 Changed to other database (BUG#20531 hinders usage of 'test' database) 2006-06-19 13:23:13 +02:00
svoj@may.pils.ru
6a90aede13 Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
 2006-06-19 16:06:29 +05:00
gkodinov@mysql.com
6777928eec Merge mysql.com:/home/kgeorge/mysql/4.1/teamclean 
into  mysql.com:/home/kgeorge/mysql/4.1/B9676
 2006-06-19 13:25:28 +03:00
gkodinov@mysql.com
c5ed7a87f4 * Bug #9676: INSERT INTO x SELECT .. FROM x LIMIT 1; slows down with big 
tables
Currently in INSERT ... SELECT ... LIMIT ... the compiler uses a 
temporary table to store the results of SELECT ... LIMIT .. and then
uses that table as a source for INSERT. The problem is that in some cases
it actually skips the LIMIT clause in doing that and materializes the 
whole SELECT result set regardless of the LIMIT.
This fix is limiting the process of filling up the temp table with only 
that much rows that will be actually used by propagating the LIMIT value.
 2006-06-19 13:22:42 +03:00
anozdrin@mysql.com
a142a4d97b Small fix for test suite: 
- fix for IM stopping routine;
  - polishing.
 2006-06-19 14:15:26 +04:00
anozdrin@mysql.com
2e56e82180 Fix of test suite in scope of fixing BUG#18023: IM: instance 
can be started several times; monitor interval must be > 2sec
 2006-06-19 14:13:34 +04:00
lars@mysql.com
5937422a53 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-06-19 12:09:24 +02:00
svoj@may.pils.ru
737e166403 Merge april:devel/BitKeeper/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1
 2006-06-19 14:13:44 +05:00
svoj@may.pils.ru
37cdb0fbf3 BUG#18036 - update of table joined to self reports table as crashed 
Certain updates of table joined to self results in unexpected
behavior.

The problem was that record cache was mistakenly enabled for
self-joined table updates. Normally record cache must be disabled
for such updates.

Fixed wrong condition in code that determines whether to use
record cache for self-joined table updates.

Only MyISAM tables were affected.
 2006-06-19 14:05:14 +05:00
ramil@mysql.com
49797c23b3 Fix for bug #20496: func_time.test failure 2006-06-19 13:03:29 +05:00
evgen@moonbone.local
a92a55bb97 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-19 01:16:18 +04:00
evgen@moonbone.local
09e84bf484 Merge moonbone.local:/work/tmp_merge-5.0 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-17 03:35:10 +04:00
evgen@moonbone.local
1aedd2ed3e Manually merged 2006-06-17 02:57:50 +04:00
evgen@moonbone.local
59b204fe08 select.result: 
After merge fix
 2006-06-17 02:52:14 +04:00
evgen@moonbone.local
7f24667598 Manually merged 2006-06-17 02:11:12 +04:00
evgen@moonbone.local
592e080643 Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-17 01:57:25 +04:00
evgen@moonbone.local
28cf3c3e64 Manually merged 2006-06-17 00:58:36 +04:00
dlenev@mysql.com
59d20e26d5 Fix for bug#13479 "REPLACE activates UPDATE trigger, not the DELETE and 
INSERT triggers".

In cases when REPLACE was internally executed via update and table had
on update (on delete) triggers defined we exposed the fact that such
optimization used by callng on update (not calling on delete) triggers.
Such behavior contradicts our documentation which describes REPLACE as
INSERT with optional DELETE.

This fix just disables this optimization for tables with on delete triggers.
The optimization is still applied for tables which have on update but have
no on delete triggers, we just don't invoke on update triggers in this case
and thus don't expose information about optimization to user.

Also added test coverage for values returned by ROW_COUNT() function (and
thus for values returned by mysql_affected_rows()) for various forms of
INSERT.
 2006-06-16 20:21:25 +04:00
msvensson@neptunus.(none)
104748ddaf Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-06-16 17:30:03 +02:00
msvensson@neptunus.(none)
0a15f9d0bf Set default valgrind options to "-v --show-reachable=yes" and make it possible to override that with --valgrind-options 2006-06-16 15:56:08 +02:00
ramil@mysql.com
10914578f1 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2006-06-16 16:43:44 +05:00
ramil@mysql.com
7e8a2ec6bb Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2006-06-16 15:27:04 +05:00
ramil@mysql.com
f2899063ee after-merge fixes. 2006-06-16 14:05:58 +05:00
serg@serg.mylan
816bd73362 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2006-06-16 10:01:13 +02:00
serg@serg.mylan
16861b2e3b Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index 
Don't rely on table->null_row when no index is used - it may be a multi-table search
 2006-06-16 09:49:18 +02:00
igor@rurik.mysql.com
ee2e2d0c6d Post_merges fixes. 2006-06-15 20:29:05 -07:00
igor@rurik.mysql.com
1241d86787 Merge rurik.mysql.com:/home/igor/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-06-15 18:40:18 -07:00
igor@rurik.mysql.com
9b7ecb5553 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-06-15 18:36:46 -07:00