brian@zim.(none)
da60b60207
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-10-25 11:03:22 -07:00
pgalbraith@mysql.com
adcc3ac935
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/data0/mysqldev/patg/mysql-5.0-viewfix
2005-10-25 19:16:08 +02:00
jimw@mysql.com
a01cd74647
Merge mysql.com:/home/jimw/my/mysql-4.1-12925
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-25 10:11:47 -07:00
jimw@mysql.com
e8eed35c6a
Fix incorrect casts in my_getopt code that capped the maximum of longlong
...
options to the wrong value. (Bug #12925 )
2005-10-25 10:10:53 -07:00
pgalbraith@mysql.com
feca138e46
This cset fixes BUG# 12838, 14061, 12129
...
mysqldump.result:
BUG# 12838
New test results for mysqldump -x on a DB with views
mysqldump.test:
sqldump.test:
BUG# 12838
New test to run mysqldump -x on a DB with views
mysqldump.c:
BUG# 12838
Removed/Changed code which created tables to be put into the dump
(For loading views of views) by creating temp tables and then using
the CREATE TABLE information in those temp tables. The problem with this
is that when mysqldump -x is called, it locks all tables, so the
temp tables could not be created, causing the mysqldump to exit with
failure. The code was changed to use SHOW FIELDS to get the column
names and type to build CREATE TABLE text used to create these tables
that views need in the dump.
2005-10-25 19:04:31 +02:00
evgen@moonbone.local
b5d426623f
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/14016-bug-4.1-mysql
2005-10-25 20:37:45 +04:00
evgen@moonbone.local
90cf3e78f0
Fix bug #14016 date_format() 2nd parameter was compared using case insensitive
...
collation
By default constant strings in second parameter of date_time() have case
insensitive collation. Because of this expressions date_format(f,'%m') and
date_format(f,'%M') wrongly becomes equal, which results in choosing wrong
column to sort by.
Now if second parameter of date_format() is constant then it's collation is
changed to case sensitive.
2005-10-25 20:37:26 +04:00
hf@deer.(none)
50a8dbc8c2
Merge deer.(none):/home/hf/work/mysql-5.0.13820
...
into deer.(none):/home/hf/work/mysql-5.0.12267
2005-10-25 21:10:58 +05:00
hf@deer.(none)
8cd0241439
Merge deer.(none):/home/hf/work/mysql-5.0.13667
...
into deer.(none):/home/hf/work/mysql-5.0.12267
2005-10-25 21:09:37 +05:00
evgen@moonbone.local
8cb0dff904
Fix bug#13392 Wrong VALUES() behaviour in INSERT SELECT with ON DUPLICATE
...
VALUES() can only refer to table insert going to.
But Item_insert_value::fix_fields() were passing to it's arg full table list,
This results in finding second column which shouldn't be found, and
failing with error about ambiguous field.
Item_insert_value::fix_fields() now passes only first table of full table
list.
2005-10-25 20:04:12 +04:00
sergefp@mysql.com
1441f1c188
BUG#13126: When choosing join order for join with nested joins, don't produce join
...
orders that cannot be handled by the executioner.
2005-10-25 19:28:27 +04:00
brian@zim.(none)
d5c90efe97
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-10-25 07:29:40 -07:00
hf@deer.(none)
86e358f1c8
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.12267
2005-10-25 19:08:33 +05:00
sergefp@mysql.com
56aeee44d3
Fix for BUG#14272: Don't run index scan when we should use quick select.
...
This could cause failures because there are table handlers (like federated)
that support quick select scanning but do not support index scanning.
2005-10-25 16:34:03 +04:00
ramil@mysql.com
c06673d49b
Fix for bug #14290 : wrong CHARACTER_MAXIMUM_LENGTH value for some text fields.
2005-10-25 17:22:58 +05:00
bar@mysql.com
c7db18719e
Bug#14255 CAST(x AS BINARY(N)) does not pad
...
type_binary.result, type_binary.test:
Adding test case.
item_timefunc.cc:
Padding code was added.
2005-10-25 15:36:39 +05:00
bar@mysql.com
a6e1f72d84
Bug#13347: empty result from query with like and cp1250 charset
...
ctype-win1250ch.c:
Like range prefix tables were wrong.
ctype_cp1250_ch.result, ctype_cp1250_ch.test:
Adding test case.
2005-10-25 14:49:04 +05:00
anozdrin@mysql.com
afb50a5de1
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13037
2005-10-25 13:04:46 +04:00
anozdrin@mysql.com
831de41ca6
Fix for BUG#13037: undefined variable in IF cause erroneous error-message.
2005-10-25 13:02:48 +04:00
ramil@mysql.com
70ba090d27
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b10303
2005-10-25 12:19:13 +05:00
brian@zim.(none)
ab0b049f85
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-10-24 23:57:15 -07:00
brian@zim.(none)
068f082960
Additional test request by Jonas. We check pushdown conditions for GEOM types.
2005-10-24 23:55:44 -07:00
brian@zim.(none)
82bcb8b369
This patch add support for storing Geometry types to Archive, Innodb, NDB, and BDB.
2005-10-24 23:20:39 -07:00
timour@mysql.com
d24027fa79
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-bug-13832
2005-10-25 09:01:47 +03:00
timour@mysql.com
f5354eba90
Fix for BUG#13832 - Unknown column t1.a in 'on clause'.
...
The cause for the bug is that the priorities of all rules/terminals
that process the FROM clause are not fully specified, and the
parser generator produces a parser that doesn't always parse
the FROM clause so that JOINs are left-associative. As a result
the final join tree produced by the parser is incorrect, which
is the cause for subsequent name resolution to fail.
2005-10-25 09:00:57 +03:00
kent@mysql.com
3e62fcf2a6
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-25 03:00:09 +02:00
kent@mysql.com
6a5a451cfb
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-10-25 02:36:51 +02:00
kent@mysql.com
4e44fead18
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.0
2005-10-25 02:29:08 +02:00
kent@mysql.com
257b17ba2f
Makefile.am:
...
Option to set environment variable MTR_BUILD_THREAD to a small
number, from what mysql-test-run calculate port numbers that
will not conflict with other runs with different thread num
2005-10-25 02:27:55 +02:00
monty@mysql.com
3e653fb922
Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization
2005-10-25 02:27:40 +03:00
anozdrin@mysql.com
bfc8e85b06
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13095
2005-10-25 00:57:23 +04:00
anozdrin@mysql.com
6d2934cb69
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13095
2005-10-25 00:55:31 +04:00
anozdrin@mysql.com
6105040ac4
Fix for BUG#13095: Cannot create VIEWs in prepared statements
...
- allow CREATE VIEW as well as DROP VIEW to use in prepared statements;
- fix CREATE VIEW implementation to make it work in prepared statements.
2005-10-25 00:54:04 +04:00
patg@krsna.patg.net
89b2b92b4e
Disabled federated test, added then removed
...
federated.disabled and instead using disabled.def (per
comments in this commit)
disabled.def:
disabled federated until bug 14272 is fixed.
.del-federated.disabled~9e4cca59f547174d:
Delete: mysql-test/t/federated.disabled
federated.disabled:
New BitKeeper file ``t/federated.disabled'' to disable federated test until
Bug 14272 is fixed.
new file
2005-10-24 13:51:05 -07:00
msvensson@neptunus.mysql.com
bb15425235
Fix for dropping a table with frm file consisting of "junk"
2005-10-24 15:05:06 +02:00
ramil@mysql.com
de26178f75
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b10303
2005-10-24 11:36:29 +05:00
igor@rurik.mysql.com
a236acce10
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2005-10-22 19:35:37 -07:00
sergefp@mysql.com
ea3ea9ed10
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-nulls-stats-r2
2005-10-23 02:49:57 +04:00
jimw@mysql.com
7510c45423
Fix merge of test that left out a drop table.
2005-10-21 19:54:34 -07:00
jimw@mysql.com
2d018862fa
Merge mysql.com:/home/jimw/my/mysql-4.1-11203
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-21 17:57:51 -07:00
pem@mysql.com
0647d280b3
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug13941/mysql-5.0
2005-10-21 14:51:51 +02:00
bar@mysql.com
b8e755ae0c
ctype_utf8.result:
...
After merge fix.
2005-10-21 16:58:10 +05:00
bar@mysql.com
321d833eef
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0.b12371
2005-10-21 16:53:50 +05:00
pem@mysql.com
1d5aeb51da
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug13941/mysql-5.0
2005-10-21 13:24:41 +02:00
bar@mysql.com
fc771accbf
Merge abarkov@bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b12371
2005-10-21 16:24:40 +05:00
gluh@mysql.com
f921ca2830
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Bugs/5.0.14089
2005-10-21 14:42:00 +05:00
bar@mysql.com
a167ddc6e7
Bug#13233
...
select distinct char(column) fails with utf8
ctype_utf8.result, ctype_utf8.test:
Adding test case
sql_yacc.yy:
Adding new syntax.
item_strfunc.h:
Fixing wrong max_length calculation.
Also, adding CHAR(x USING charset),
for easier migrating from 4.1 to 5.0,
according to Monty's suggestion.
2005-10-21 14:41:56 +05:00
gluh@eagle.intranet.mysql.r18.ru
e8d52711ad
fix for bug#14089 FROM list subquery always fails when
...
information_schema is current database
skip the check of I_S tables if table is derived table
2005-10-21 13:14:54 +05:00
bar@mysql.com
612c0560a4
Merge abarkov@bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b12371
2005-10-21 11:55:46 +05:00
sergefp@mysql.com
15a78334c3
BUG#9622, stage 2, work together with fix for BUG#12232:
...
added "nulls_ignored" index statistics collection method for MyISAM tables.
(notification trigger: this is about BUG#9622).
2005-10-21 06:29:17 +04:00