mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32648 commits 2790 branches 343 tags 1.7 GiB
Commit graph

11220 commits

Author SHA1 Message Date
kent@mysql.com
cfe9102791 disabled.def: 
To somplify merge later, make files more similar in format
 2006-04-12 20:06:15 +02:00
kent@mysql.com
dbc797971e disabled.def: 
Disabled randomly failing tests
 2006-04-10 22:51:17 +02:00
kent@mysql.com
41923d3bb1 mysql-test-run.pl: 
Added --ndbcluster_port for backward compatibility
make_win_src_distribution.sh:
  Updated to reflect 5.1 changes
 2006-04-10 14:15:02 +02:00
kent@mysql.com
91d28a6d36 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
 2006-04-08 04:37:59 +02:00
kent@mysql.com
f957d8e282 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release.old03 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
 2006-04-08 04:29:17 +02:00
joerg@mysql.com
e246f0402f Merge mysql.com:/M50/mtr-5.0 into mysql.com:/M51/clone-5.1 2006-04-07 19:56:23 +02:00
joerg@mysql.com
4a5985e694 Manual merge. 2006-04-07 19:50:07 +02:00
joerg@mysql.com
657d1bd182 Manual merge. 2006-04-07 19:42:46 +02:00
joerg@mysql.com
a7edbc647e mysql-test/mysql-test-run.sh : Provide info about the options used. 2006-04-07 19:27:19 +02:00
joerg@mysql.com
a663acb13f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/M51/merge-5.1
 2006-04-07 14:05:49 +02:00
joerg@mysql.com
24bf40caec Null-merge, as the changes in question were backports from 5.1. 2006-04-07 13:58:45 +02:00
joerg@mysql.com
945599f3cf Manual merge. 2006-04-07 13:44:43 +02:00
joerg@mysql.com
65f4595e9a mysql-test/mysql-test-run.pl : Add option "with-ndbcluster-only" (ignored). 2006-04-07 13:34:39 +02:00
joerg@mysql.com
df09a0cedc Manual merge. 2006-04-07 13:16:40 +02:00
joerg@mysql.com
7e4d41de58 Perl test script: Avoid some aborts, which made the whole build/test process terminate. 2006-04-07 13:02:15 +02:00
serg@serg.mylan
8db57d7b3d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-04-07 12:42:57 +02:00
serg@serg.mylan
1620426482 rpl_ndb_delete_nowhere.test requires ndb 2006-04-07 12:38:38 +02:00
andrey@lmy004.
1d816d2cf3 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug17494-real
 2006-04-07 12:29:32 +02:00
joerg@mysql.com
a0541800aa mysql-test/mysql-test-run.sh : Add option "--with-ndbcluster-only" (backport from 5.1) 2006-04-07 12:22:55 +02:00
andrey@lmy004.
bdfdd38f60 update tests 2006-04-07 11:29:15 +02:00
hartmut@mysql.com
4a4c459fa3 Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0 
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1
 2006-04-07 11:23:55 +02:00
hartmut@mysql.com
7ed2c6207a fix for wrong QUARTER calculation in EXTRACT() (Bug #18100) 2006-04-07 11:15:15 +02:00
gluh@eagle.intranet.mysql.r18.ru
4ef7e5b5f7 Fix for bug#18281 group_concat changes charset to binary 
skip charset aggregation for order columns
 2006-04-07 13:19:31 +05:00
gluh@eagle.intranet.mysql.r18.ru
fe7ea20764 Bug#18469 make test fails on information_schema 
move test case for bug 14290 to ctype_ucs test
 2006-04-07 12:32:24 +05:00
andrey@lmy004.
7bd09ac24d manual merge 2006-04-07 09:18:29 +02:00
andrey@lmy004.
36cfa4dfa1 fix for bug #17494 (The algorithm for calculating execution times is not fully correct) 
This also should fix 17493 and 17346, and probably 16397 (not tested).
WL#1034 (Internal CRON)
(post-review commit)
 2006-04-07 09:08:58 +02:00
sergefp@mysql.com
44628436e5 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/home/psergey/mysql-5.1-bug18558-pnd
 2006-04-06 21:26:23 +04:00
sergefp@mysql.com
68bd945ca3 BUG#18558 "Partition pruning results are incorrect for certain class of WHERE clauses" : 
* Produce right results for conditions that were transformed to "(partitioning_range) AND
  (list_of_subpartitioning_ranges)": make each partition id set iterator auto-reset itself
  after it has returned all partition ids in the sequence 
* Fix "Range mapping" and "Range mapping" partitioning interval analysis functions to 
  correctly deal with NULL values.
 2006-04-06 21:23:33 +04:00
joerg@mysql.com
73a0ae9d9b Backport of 5.1 test options "--with-ndbcluster" and "--with-ndbcluster-only" as dummies (ignored). 2006-04-06 18:42:07 +02:00
svoj@april.(none)
fb37c30699 Merge april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.1-new
 2006-04-06 16:44:26 +05:00
svoj@april.(none)
85ff7bec70 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.0
 2006-04-06 15:25:39 +05:00
svoj@april.(none)
209682e051 Fix for bug#14945 "Truncate table doesn't reset the auto_increment 
counter".

When TRUNCATE TABLE was called within an stored procedure the
auto_increment counter was not reset to 0 even if straight
TRUNCATE for this table did this.

This fix makes TRUNCATE in stored procedures to be handled exactly
in the same way as straight TRUNCATE. We achieve this by rolling
back the fix for bug 8850, which is no longer needed since stored
procedures don't require prelocked mode anymore (and TRUNCATE is
not allowed in stored functions or triggers).
 2006-04-06 15:19:01 +05:00
msvensson@shellback.(none)
e1348410d7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-04-06 11:38:50 +02:00
msvensson@shellback.(none)
cd15f309fb Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-06 10:34:41 +02:00
bar@mysql.com
ceb0a0b2d5 Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-04-06 12:00:14 +05:00
bar@mysql.com
0459d69d7a Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-04-06 10:53:42 +05:00
bar@mysql.com
925ea02b4c This problem has already been fixed by one of the previous changes. 
Adding test case to cover queries which worked incorrectly earlier:
Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci
 2006-04-06 10:51:23 +05:00
igor@rurik.mysql.com
e732d0536f Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-05 14:06:34 -07:00
igor@rurik.mysql.com
58ad55937d Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-04-05 14:00:54 -07:00
bar@mysql.com
31ef6c7c79 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-04-05 19:47:36 +05:00
bar@mysql.com
cbcd9cd575 Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-04-05 19:00:02 +05:00
msvensson@shellback.(none)
b0c6455908 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-05 10:08:38 +02:00
mats@mysql.com
7b250a3fc0 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b18436-mysql-5.1-new
 2006-04-05 09:10:31 +02:00
kent@mysql.com
b492d05ee9 Merge 2006-04-04 23:37:44 +02:00
igor@rurik.mysql.com
f485125968 Fixed bug #18237. 
The code in opt_sum_query that prevented the COUNT/MIN/MAX 
optimization from being applied to outer joins  was not adjusted 
after introducing nested joins. As a result if an outer join
contained a reference to a view as an inner table the code of
opt_sum_query missed the presence of an on expressions and
erroneously applied the mentioned optimization.
 2006-04-04 12:55:02 -07:00
joerg@mysql.com
d99d4d9bb1 Merge 2006-04-04 20:25:23 +02:00
mats@mysql.com
0729afd839 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b18436-mysql-5.1-new
 2006-04-04 19:44:03 +02:00
timour@mysql.com
51476082b7 Merge mysql.com:/home/timka/mysql/src/5.0-tmp-merge 
into  mysql.com:/home/timka/mysql/src/5.1-merge
 2006-04-04 14:35:17 +03:00
igor@rurik.mysql.com
679dbc7627 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-04 04:35:16 -07:00
sergefp@mysql.com
b83da14c6a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/psergey/mysql-5.1-bug18659-pre
 2006-04-04 15:35:14 +04:00