1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-15 09:02:33 +03:00
Commit Graph

20121 Commits

Author SHA1 Message Date
kostja@bodhi.(none)
0d027edd6a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-17 13:32:19 +04:00
kostja@bodhi.(none)
6b3784870c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-17 13:10:02 +04:00
svoj@june.mysql.com
cb995365fb Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  mysql.com:/home/svoj/devel/mysql/test/mysql-5.1-engines
2007-07-17 13:20:32 +05:00
istruewing@chilla.local
db2884a530 Disabled a test case that reports an error on OSX. 2007-07-17 09:52:55 +02:00
istruewing@chilla.local
ba177535f5 Post-merge fixes
Disabled test cases that produce errors in a "server log".
2007-07-17 09:25:01 +02:00
kostja@bodhi.(none)
b8fc731804 Post-merge fixes (merge from the main). 2007-07-17 00:59:21 +04:00
kostja@bodhi.(none)
7989c712a6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-07-16 23:41:28 +04:00
kostja@bodhi.(none)
88fc7cab26 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-16 23:31:36 +04:00
joerg@trift-lap.fambruehe
125bc0ad54 Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-07-16 19:21:09 +02:00
istruewing@chilla.local
7f6bf17bab Post-merge fix
Disabled a test that reports Slave SQL error in warnings file.
2007-07-16 16:12:05 +02:00
kostja@bodhi.(none)
be4f73c44f Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-16 17:22:33 +04:00
svoj@mysql.com/june.mysql.com
ee13e03ca0 BUG#29807 - innodb_mysql.test: Cannot find table test/t2 from the
internal data dictionary
- re-enabled innodb_mysql test;
- added a rule to through away expected warning to mtr_report.pl;
- fixed a test case to produce unique warning.
2007-07-16 15:09:46 +05:00
evgen@moonbone.local
975d22327e Extended fix for the bug#29555.
The get_time_value function is added. It is used to obtain TIME values both
from items the can return time as an integer and from items that can return
time only as a string.
The Arg_comparator::compare_datetime function now uses pointer to a getter
function to obtain values to compare. Now this function is also used for
comparison of TIME values.
The get_value_func variable is added to the Arg_comparator class.
It points to a getter function for the DATE/DATETIME/TIME comparator.
2007-07-15 21:51:36 +04:00
istruewing@chilla.local
e819c326ed Post-merge fixes
Disabled tests which break automatic merging due to
non-empty warnings file.
2007-07-15 18:47:57 +02:00
kostja@bodhi.(none)
5466b0df14 Add a teste case for Bug#27296 "Assertion in ALTER TABLE SET DEFAULT in
Linux Debug build (possible deadlock)"

The bug is not repeatable any more.
2007-07-15 13:34:35 +04:00
kostja@bodhi.(none)
9175e85078 A fix for Bug#27406 Events: failure only causes a warning. Update test
results.
When executing a CREATE EVENT statement with ON COMPLETION NOT PRESERVE 
clause (explicit or implicit) and completion date in the past, we do not 
create the event. Or, put it differently, we create it and then drop 
immediately.
A warning is issued in this case, not an error -- we want to load 
successfully old database dumps, and such dumps may contain events
that are no longer valid.

Update the warning text to not imply an erroneous condition.
2007-07-15 13:25:38 +04:00
evgen@moonbone.local
1baf8a9301 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/29729-bug-5.0-opt-mysql
2007-07-14 23:30:07 +04:00
evgen@moonbone.local
e717f9d2eb Bug#29729: Wrong conversion error led to an empty result set.
The Field_newdate::store when storing a DATETIME value was returning the
'value was cut' error even if the thd->count_cuted_fields flag is set to
CHECK_FIELD_IGNORE. This made range optimizr think that there is no
appropriate data in the table and thus to return an empty set.

Now the Field_newdate::store function returns conversion error only if the
thd->count_cuted_fields flag isn't set to CHECK_FIELD_IGNORE.
2007-07-14 22:43:58 +04:00
sergefp@mysql.com
ecfa8da35c BUG#29740: Make the test result deterministic 2007-07-14 22:02:10 +04:00
istruewing@chilla.local
e307a089a9 Merge chilla.local:/home/mydev/mysql-5.1-amain
into  chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-14 19:35:43 +02:00
sergefp@pylon64.mylan
a452cbff79 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/psergey/mysql-5.0-bug29740
2007-07-14 20:31:59 +04:00
igor@olga.mysql.com
bec9500ec0 Merge olga.mysql.com:/home/igor/mysql-5.1-rpl
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-merge
2007-07-13 23:54:41 -07:00
igor@olga.mysql.com
d40c4aaa67 Merge olga.mysql.com:/home/igor/mysql-5.0-rpl
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-merge
2007-07-13 19:05:30 -07:00
tomas@whalegate.ndb.mysql.com
07656398a8 correct cluster support check 2007-07-13 22:45:05 +02:00
gshchepa/uchum@gleb.loc
b434254e0e symlink.test, symlink.result:
Minor fix for test case of bug #29325 to make emb test happy.
2007-07-14 01:34:46 +05:00
tomas@whalegate.ndb.mysql.com
b0aabc7940 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
2007-07-13 22:22:02 +02:00
tomas@whalegate.ndb.mysql.com
d00282ae36 avoid multiple defines of server1/2 2007-07-13 22:21:19 +02:00
mleich@three.local.lan
f1a6ad4dde Additional tests checking for symptoms observed within
Bug28309 First insert violates unique constraint - was "memory" table empty ?
---
Add missing phony targets
2007-07-13 18:32:22 +02:00
gshchepa/uchum@gleb.loc
127c6ca608 Merge gleb.loc:/home/uchum/work/bk/5.1
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-13 20:52:03 +05:00
gshchepa/uchum@gleb.loc
92b65b8a4b Merge gleb.loc:/home/uchum/work/bk/5.0
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-13 20:49:21 +05:00
sergefp@mysql.com
8bba908915 BUG#29740: Wrong query results for index_merge/union over HEAP table.
- return HA_KEY_SCAN_NOT_ROR flag for HASH indexes;
- Fix ha_heap::cmp_ref() to work with BTREE index scans.
2007-07-13 19:13:40 +04:00
gshchepa/uchum@gleb.loc
1674d8dc35 Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-13 19:36:10 +05:00
tomas@whalegate.ndb.mysql.com
6ecee9d5da update bug dependency on failing test 2007-07-13 16:06:12 +02:00
tomas@whalegate.ndb.mysql.com
a0b5dd6ee7 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
2007-07-13 15:59:06 +02:00
tomas@whalegate.ndb.mysql.com
9d1d7b8f61 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-07-13 15:54:57 +02:00
gkodinov/kgeorge@magare.gmz
d6ad4e6eb9 disabled the output of the full path in tesing bug 29325 2007-07-13 16:32:29 +03:00
tomas@whalegate.ndb.mysql.com
a11153663d avoid some sporadic startup issues 2007-07-13 14:31:40 +02:00
gkodinov/kgeorge@magare.gmz
2b8e462637 Bug 29325: moved the test from create_not_windows to symlink. 2007-07-13 13:56:22 +03:00
istruewing@chilla.local
dd72d5255d Merge chilla.local:/home/mydev/mysql-5.1-ateam
into  chilla.local:/home/mydev/mysql-5.1-bug28810
2007-07-13 08:18:27 +02:00
dkatz@damien-katzs-computer.local
276b95a04a Merge damien-katzs-computer.local:/Users/dkatz/50
into  damien-katzs-computer.local:/Users/dkatz/mysql51
2007-07-13 00:47:37 -04:00
dkatz@damien-katzs-computer.local
d2e45f205c Minor fixes for test failures and compiler warnings for Bug #29579. 2007-07-13 00:45:54 -04:00
dkatz@damien-katzs-computer.local
230adda1e2 Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into  damien-katzs-computer.local:/Users/dkatz/mysql51
2007-07-12 22:22:40 -04:00
dkatz@damien-katzs-computer.local
a55c8bef49 Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into  damien-katzs-computer.local:/Users/dkatz/50
2007-07-12 22:19:07 -04:00
dkatz@damien-katzs-computer.local
2a58120fc4 Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  damien-katzs-computer.local:/Users/dkatz/mysql51
2007-07-12 22:15:03 -04:00
dkatz@damien-katzs-computer.local
899aaa6bb2 Bug #29579 Clients using SSL can hang the server
Added an option to yassl to allow "quiet shutdown" like openssl does. This option causes the SSL libs to NOT perform the close_notify handshake during shutdown. This fixes a hang we experience because we hold a lock during socket shutdown.
2007-07-12 22:06:33 -04:00
svoj@mysql.com/april.(none)
c16c5db7a8 BUG#29464 - load data infile into table with big5 chinese fulltext index
hangs 100% cpu

Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
character set.
2007-07-13 03:29:25 +05:00
svoj@mysql.com/april.(none)
e11d75e45b BUG#29445 - match ... against () never returns
Part 2:
Searching fulltext index for a word with boolean mode truncation
operator may cause infinite loop.

The problem was that "smarter index merge" was used with "trunc-words",
which must never happen.

Affects 5.1 only.
2007-07-13 03:25:27 +05:00
evgen@moonbone.local
1b1464ba30 Bug#29739: Incorrect time comparison in BETWEEN.
Time values were compared by the BETWEEN function as strings. This led to a
wrong result in cases when some of arguments are less than 100 hours and other
are greater.

Now if all 3 arguments of the BETWEEN function are of the TIME type then
they are compared as integers.
2007-07-12 23:09:55 +04:00
kostja@bodhi.(none)
675a4e8f7b Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  bodhi.(none):/opt/local/work/mysql-5.0-26141-final
2007-07-12 22:28:13 +04:00
kostja@bodhi.(none)
5ab4b6f1ac A fix and a test case for Bug#26141 mixing table types in trigger
causes full table lock on innodb table.
Also fixes Bug#28502 Triggers that update another innodb table 
will block on X lock unnecessarily (duplciate).
Code review fixes.

Both bugs' synopses are misleading: InnoDB table is
not X locked. The statements, however, cannot proceed concurrently, 
but this happens due to lock conflicts for tables used in triggers,
not for the InnoDB table. 

If a user had an InnoDB table, and two triggers, AFTER UPDATE and 
AFTER INSERT, competing for different resources (e.g. two distinct
MyISAM tables), then these two triggers would not be able to execute
concurrently. Moreover, INSERTS/UPDATES of the InnoDB table would
not be able to run concurrently. 
The problem had other side-effects (see respective bug reports).

This behavior was a consequence of a shortcoming of the pre-locking
algorithm, which would not distinguish between different DML operations
(e.g. INSERT and DELETE) and pre-lock all the tables
that are used by any trigger defined on the subject table.

The idea of the fix is to extend the pre-locking algorithm to keep track,
for each table, what DML operation it is used for and not
load triggers that are known to never be fired.
2007-07-12 22:26:41 +04:00