database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Code Activity
46,939 Commits 3,270 Branches 1,096 Tags
016bff8adcc2332772b51f8dbdc5a3d926f5a04c
Commit Graph

18065 Commits

Author SHA1 Message Date
mskold/marty@linux.site
5e60232da9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-09-22 21:14:58 +02:00
msvensson@shellback.(none)
5cc468b6d6 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-22 21:00:23 +02:00
msvensson@shellback.(none)
2bc57811d4 Immediately skip tests that need innodb if mysqld does not support it 2006-09-22 20:58:16 +02:00
kaa@polly.local
b98475077c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-09-22 20:01:51 +04:00
kaa@polly.local
a22f71ff0f Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
 2006-09-22 19:53:59 +04:00
kaa@polly.local
e9bdddfa28 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
 2006-09-22 19:50:16 +04:00
kaa@polly.local
25f2c27a95 Merge polly.local:/tmp/22129/bug22129/my50-bug22129 
into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
 2006-09-22 19:46:09 +04:00
kaa@polly.local
10a60b42f6 Merge polly.local:/tmp/22129/bug22129/my41-bug22129 
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
 2006-09-22 19:44:51 +04:00
kaa@polly.local
c06dd5cdf0 Merge polly.local:/tmp/22129/bug22129/my50-bug22129 
into  polly.local:/tmp/22129/bug22129/my51-bug22129
 2006-09-22 19:42:27 +04:00
kaa@polly.local
6fd25f611a Merge polly.local:/tmp/22129/bug22129/my41-bug22129 
into  polly.local:/tmp/22129/bug22129/my50-bug22129
 2006-09-22 19:40:07 +04:00
kaa@polly.local
1530b51d8f Fixed bug #22129: A small double precision number becomes zero 
Better checks for underflow/overflow
 2006-09-22 19:23:58 +04:00
jani@ua141d10.elisa.omakaista.fi
0fb727866f Fixed result file. Blob width 8192 changed to 16777216. 2006-09-22 16:35:52 +03:00
georg@lmy002.wdf.sap.corp
67a701003c Fix for bug #19121: Windows incompatible udf_example 2006-09-22 14:42:43 +02:00
msvensson@shellback.(none)
fe0cfacf35 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-21 20:31:35 +02:00
msvensson@shellback.(none)
c898d8e144 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-21 20:28:12 +02:00
mskold/marty@mysql.com/linux.site
42d64e4275 Bug #21072 Duplicate key error in NDB references wrong key: use MAX_KEY to signal unknown key 2006-09-21 16:49:07 +02:00
georg@lmy002.wdf.sap.corp
f4af1d8283 Windows 64bit fixes 
Fixed udf_example, so tests now can also run udf on win.
 2006-09-21 15:19:20 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
4f5e3b3dee After merge fixes 2006-09-21 14:19:17 +02:00
lars/lthalmann@dl145k.mysql.com
2ec2300759 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-21 13:54:57 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
738cd74b52 After merge fixes 2006-09-21 13:38:01 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
2c5dc57e27 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-09-21 13:28:16 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
9538acf5dc Adding proper setup phase for test case rpl_insert_id 2006-09-21 13:19:52 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
d3f503a0bd Fix for bug #20204: "order by" changes the results returned 
Item_substr's results are improperly stored in a temporary table due to       
wrongly calculated max_length value for multi-byte charsets if two            
arguments specified.
 2006-09-21 16:05:01 +05:00
lars/lthalmann@mysql.com/dl145j.mysql.com
c34601adec If mysqlslap schema does not exists, it should be an error, so no need for IF EXISTS 
Setting default database back to 'test', so that next test case don't use the wrong database
 2006-09-21 13:04:33 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
588ab714ff Added master-slave synchronization to make sure truncate happen before slave manipulations on every platform 2006-09-21 11:45:16 +02:00
istruewing@chilla.local
f083782c42 Merge chilla.local:/home/mydev/mysql-5.0--main 
into  chilla.local:/home/mydev/mysql-5.0-toteam
 2006-09-21 10:55:23 +02:00
dlenev@mockturtle.local
091ed9fb38 Fix for bug#20670 "UPDATE using key and invoking trigger that modifies 
this key does not stop" (version for 5.0 only).

UPDATE statement which WHERE clause used key and which invoked trigger
that modified field in this key worked indefinetely.

This problem occured because in cases when UPDATE statement was
executed in update-on-the-fly mode (in which row is updated right
during evaluation of select for WHERE clause) the new version of
the row became visible to select representing WHERE clause and was
updated again and again.
We already solve this problem for UPDATE statements which does not
invoke triggers by detecting the fact that we are going to update
field in key used for scanning and performing update in two steps,
during the first step we gather information about the rows to be
updated and then doing actual updates. We also do this for
MULTI-UPDATE and in its case we even detect situation when such
fields are updated in triggers (actually we simply assume that
we always update fields used in key if we have before update
trigger).

The fix simply extends this check which is done in check_if_key_used()/
QUICK_SELECT_I::check_if_keys_used() routine/method in such way that
it also detects cases when field used in key is updated in trigger.
As nice side-effect we have more precise and thus more optimal
perfomance-wise check for the MULTI-UPDATE.
Also check_if_key_used()/QUICK_SELECT_I::check_if_keys_used() were
renamed to is_key_used()/QUICK_SELECT_I::is_keys_used() in order to
better reflect that boolean predicate.

Note that this check is implemented in much more elegant way in 5.1
 2006-09-21 11:35:38 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
43194fad43 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/mysql-4.1-maint
 2006-09-21 09:35:17 +05:00
lars/lthalmann@mysql.com/dl145h.mysql.com
fe782f92d6 Vertical printout in test to make easier to read 2006-09-21 03:32:42 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
00ba129e51 Version 5.1 needs one connection less 2006-09-21 02:44:58 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
bc8207c9b8 Result file fixes after merge 2006-09-21 02:39:47 +02:00
lars/lthalmann@dl145j.mysql.com
a397c1805c Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-21 01:15:28 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
6aded45614 Fix of result files from merge 2006-09-21 00:59:48 +02:00
lars/lthalmann@dl145j.mysql.com
0f85f6f760 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-21 00:53:47 +02:00
lars/lthalmann@dl145j.mysql.com
57a74ea4af Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-21 00:23:20 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
d20e326504 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-09-21 00:05:56 +02:00
mskold/marty@mysql.com/linux.site
9707d43cc3 bug#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS,: Updated reslt file 2006-09-20 20:04:58 +02:00
igor@rurik.mysql.com
2e2c5a20c0 Merge rurik.mysql.com:/home/igor/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-09-20 09:47:36 -07:00
igor@rurik.mysql.com
d957636471 Fixed bug #20108. 
Any default value for a enum fields over UCS2 charsets was corrupted
when we put it into the frm file, as it had been overwritten by its
HEX representation.
To fix it now we save a copy of structure that represents the enum
type and when putting the default values we use this copy.
 2006-09-20 09:46:12 -07:00
msvensson@shellback.(none)
c74ebcc176 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-20 18:02:42 +02:00
msvensson@shellback.(none)
7029074c24 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-20 18:02:11 +02:00
igor@rurik.mysql.com
20b3e8a2f8 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-09-20 08:10:21 -07:00
igor@rurik.mysql.com
f2225cab27 Fixed bug #22015: crash with GROUP_CONCAT over a derived table 
that returns the results of aggregation by GROUP_CONCAT.
The crash was due to an overflow happened for the field
sortoder->length.
The fix prevents this overflow exploiting the fact that the
value of sortoder->length cannot be greater than the value of
thd->variables.max_sort_length.
 2006-09-20 08:08:57 -07:00
mskold/marty@linux.site
d6d0208dfb Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-09-20 16:49:06 +02:00
mskold/marty@mysql.com/linux.site
99a4f96535 Bug#18976 CRBR: multiple binlog, second binlog may miss schema log events:Change test back to verify again 2006-09-20 16:46:54 +02:00
msvensson@shellback.(none)
0c429abd29 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-20 15:45:42 +02:00
msvensson@shellback.(none)
339cd91a98 Fix problem with testcase timeouts not working. The timeout value was always multiplied with 10 
since the $opt_valgrind variable was initialised to 0, thus being "defined"
 2006-09-20 15:41:46 +02:00
istruewing@chilla.local
77d610c2b4 Merge chilla.local:/home/mydev/mysql-5.1--team 
into  chilla.local:/home/mydev/mysql-5.1-tomain
 2006-09-20 14:36:32 +02:00
Kristofer.Pettersson@naruto.
3599c87654 Merge kpettersson@bk-internal:/home/bk/mysql-5.1-maint 
into  naruto.:C:/cpp/mysql-5.1-maint
 2006-09-20 12:21:49 +02:00
istruewing@chilla.local
1639e4a45f Merge chilla.local:/home/mydev/mysql-5.0-bug20627 
into  chilla.local:/home/mydev/mysql-5.1-bug20627
 2006-09-20 12:17:51 +02:00