brian@zim.(none)
1d02038c1f
Disabled two broken test, created P1 showstoppers from them.
2006-04-09 11:57:25 -07:00
joerg@mysql.com
6dbb1edad8
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/M51/mysql-5.1
2006-04-09 19:17:26 +02:00
aivanov@mysql.com
2d5dd11852
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alexi/bugs/mysql-5.1-15758
2006-04-09 20:19:40 +04:00
aivanov@mysql.com
1488caeca6
Merge mysql.com:/home/alexi/bugs/mysql-5.0-15758-work
...
into mysql.com:/home/alexi/bugs/mysql-5.1-15758
2006-04-09 17:48:47 +04:00
joerg@mysql.com
208ae694bb
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/M51/mysql-5.1
2006-04-08 16:08:38 +02:00
ingo@mysql.com
26c4e82fee
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-aid
2006-04-08 10:48:33 +02:00
igor@rurik.mysql.com
2e662287ce
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into rurik.mysql.com:/home/igor/mysql-5.1
2006-04-07 17:56:33 -07:00
ingo@mysql.com
ddf81838a7
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-aid
2006-04-07 23:39:01 +02:00
serg@serg.mylan
5eefa6ec1f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-04-07 22:38:53 +02:00
serg@serg.mylan
c17d3a5148
plugin/fulltext/configure.in
...
no sense in building static library version of a plugin
plugin/fulltext/plugin_example.c
comments clarified. everything local to a plugin was declared static
2006-04-07 22:36:04 +02:00
igor@rurik.mysql.com
0d2e911204
Merge rurik.mysql.com:/home/igor/mysql-5.1
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-04-07 13:22:07 -07:00
aivanov@mysql.com
612266ec90
Fixed BUG#15758: "Holding adaptive search latch in
...
innobase_query_caching_of_table_permitted()".
Applied the patch due to Heikki Tuuri.
Also removed superfluous #ifdefs.
2006-04-07 23:58:17 +04:00
joerg@mysql.com
06cba02907
Merge mysql.com:/M50/clone-5.0 into mysql.com:/M51/mysql-5.1
2006-04-07 16:45:47 +02:00
bpontz@shasta.mysql.com
1ec9119308
configure.in:
...
increase version number for clone
2006-04-07 08:54:16 -04:00
ingo@mysql.com
2697018c5b
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-aid
2006-04-07 14:39:49 +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
serg@serg.mylan
a5ed8bf668
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:13:42 +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
serg@serg.mylan
216fb55743
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-04-07 10:30:34 +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
ingo@mysql.com
745dd7fd1f
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-aid
2006-04-07 09:01:49 +02:00
knielsen@mysql.com
af294b281e
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
2006-04-07 08:39:22 +02:00
igor@rurik.mysql.com
28b7b96a8f
Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-04-06 15:31:30 -07:00
igor@rurik.mysql.com
9bd0b97824
Fixed bug #15917 : unexpected complain for a NIST test case.
...
The problem was due to the fact that with --lower-case-table-names set to 1
the function find_field_in_group did not convert the prefix 'HU' in
HU.PROJ.CITY into lower case when looking for it in the group list. Yet the
names in the group list were extended by the database name in lower case.
2006-04-06 15:29:15 -07:00
konstantin@mysql.com
8cb1245c1e
Implement --warning-mode in SETUP.sh. The value of the
...
argument can be either "pedantic" or "old" (actually, or anything
else). In case of "pedantic" mode, use -ansi -pedantic compilation
flags. Fix the build to compile in pedantic mode. (Version 3 of
the patch, with after-review fixes)
2006-04-07 02:25:59 +04:00
serg@serg.mylan
ec61fe292a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-04-06 22:28:45 +02:00
ingo@mysql.com
33ff3e37a3
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-aid
2006-04-06 20:55:25 +02:00
igreenhoe@mysql.com
fe9b9c61d2
Merge mysql.com:/home/greenman/workspace-mysql/mysql/mysql-5.0
...
into mysql.com:/home/greenman/workspace-mysql/mysql/bug-5.0-16240
2006-04-06 10:42:34 -07:00
sergefp@mysql.com
f962fa5b91
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug18237-review
2006-04-06 21:42:33 +04:00
sergefp@mysql.com
be0ebd9e0a
Remove redundant code in opt_sum_query()
2006-04-06 21:42:03 +04: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
igreenhoe@mysql.com
84bfed689d
Fix for Bug #16240
2006-04-06 10:13:46 -07: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
knielsen@mysql.com
534a87dda2
Remove no longer needed generation of dummy ib_config.h
2006-04-06 17:03:01 +02:00
serg@serg.mylan
6f492397f8
changes to make plugin_example useful as a template:
...
force pkglibdir to be in "mysql" package, template files:
AUTHORS, ChangeLog, NEWS, README, configure.in
2006-04-06 16:07:53 +02:00