evgen@moonbone.local
71b731e92e
Manually merged
2005-10-27 17:44:28 +04:00
monty@mysql.com
7ea49858b4
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-10-27 15:16:12 +03:00
monty@mysql.com
1b3ed12017
Fixes during review of pushed code
...
Added back missing return in mysql_delete()
2005-10-27 15:15:01 +03:00
bar@mysql.com
dfe9480497
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b13347
2005-10-27 13:41:09 +05:00
ramil@mysql.com
8ccf0f3791
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b14290
2005-10-27 10:09:41 +05:00
jimw@mysql.com
305b58b8a2
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-26 15:47:56 -07:00
jimw@mysql.com
607c129737
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-26 14:11:08 -07:00
brian@zim.(none)
ff6cfe6d66
Change in gis test to allow NDB to be able to call generic tests. Fix for Archive so that ALTER TABLE doesn't issue a warning. Also added test case for alter table.
2005-10-26 13:55:08 -07:00
patg@krsna.patg.net
bd0497ce3b
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into krsna.patg.net:/home/patg/mysql-build/mysql-4.1
2005-10-26 09:22:47 -07:00
brian@zim.(none)
22644b5f1c
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-10-26 09:08:44 -07:00
kent@mysql.com
cd0592136a
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-26 11:45:41 +02:00
kent@mysql.com
a2d7a9da90
mysql-test-run.pl:
...
Added MTR_BUILD_THREAD to control the port range
2005-10-26 01:24:03 +02:00
kent@mysql.com
77ecd8d968
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-26 00:03:27 +02:00
kent@mysql.com
5561697158
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-10-25 23:56:08 +02:00
patg@krsna.patg.net
7243b7bb49
BUG# 12123
...
Made change to mysqlimport to set character_set_database to binary to
make importing various charsets/columns work correctly.
2005-10-25 14:50:08 -07:00
sergefp@mysql.com
2219ada7f6
BUG#14139: When handling "CREATE TABLE(field_X type_spec,...) SELECT smth AS field_X, ...."
...
avoid multiplying length of field_X by charset->mbmaxlen twice when calculating space
required for field_X in the new table.
2005-10-26 00:56:17 +04:00
jimw@mysql.com
a4cc61f213
Merge mysql.com:/home/jimw/my/mysql-5.0-13534
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-25 13:42:04 -07:00
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
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
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
andrey@lmy004.
991b6f1440
fix for bug #12595 (ESCAPE must be exactly 1 character long)
...
ESCAPE has length of 1 if specified and sql_mode is NO_BACKSLASH_ESCAPES
or has length of 0 or 1 in every other situation.
(approved patch applied on a up-to-date tree re-commit)
2005-10-21 04:01:52 +03:00
kent@mysql.com
70c816c801
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-20 23:23:33 +02:00
msvensson@neptunus.(none)
c7174f18f9
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-10-20 10:28:52 +02:00
bar@mysql.com
7671bc00c4
Bug#12371: executing prepared statement fails (illegal mix of collations)
...
ctype_utf8.test, ctype_utf8.result:
Adding test case.
item.h:
item.cc:
Adding Item_param::safe_charset_converter
2005-10-20 11:56:27 +05:00
jimw@mysql.com
2c90e2f7a6
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-19 13:47:05 -07:00
elliot@mysql.com
9b62dd1545
Merge mysql.com:/home/emurphy/src/bk-innodb/mysql-5.0
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
2005-10-19 14:40:05 -04:00
elliot@mysql.com
0955163bb1
BUG#14056 Column prefix index on UTF-8 primary key column causes 'Can't find record..'
...
Applying InnoDB patch from Jan Lindstrom
2005-10-19 12:06:29 -04:00
pem@mysql.com
ca5e435f82
Fixed BUG#13941: replace() string fuction behaves badly inside stored
...
procedure
For some functions returning strings (like "replace" and "ifnull" - where
val_str() is returning a pointer into one of the parameters) - we ended
up with a dangling pointer after the new operator destroyed the reuse item
in the eval function.
A working, if not very elegant, solution is to simply copy the string in
such cases.
2005-10-19 14:54:54 +02:00
konstantin@mysql.com
bee76b78a2
A fix and a test case for Bug#13587 "Server crash when SP is created
...
without database"
2005-10-19 14:46:32 +04:00
sergefp@mysql.com
867e790dc8
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug12915-merge
2005-10-19 12:42:50 +04:00
kent@mysql.com
8bccfab21f
mysql.spec.sh:
...
Enabled yaSSL
mysql-test-run.pl:
Increased test case timeout from 15 min
2005-10-19 02:53:03 +02:00
brian@zim.(none)
3cde418f27
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-10-18 15:01:50 -07:00
brian@zim.(none)
6ab502e523
Per a user request there is now support for "CHECK TABLE" where the table is an archive file.
2005-10-18 14:52:38 -07:00
sergefp@mysql.com
e7065d355c
BUG#121915: Merge 4.1->5.0
2005-10-19 01:52:06 +04:00
bell@sanja.is.com.ua
aadf571b4f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-10-19 00:26:18 +03:00
ranger@regul.home.lan
e3b17f529c
After review fixes
2005-10-18 23:49:31 +03:00
bell@sanja.is.com.ua
408f2619e5
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-10-18 21:50:00 +03:00
bell@sanja.is.com.ua
f95489f91b
check of ACL initialization in is_acl_user() (BUG#13504)
2005-10-18 21:42:26 +03:00
jimw@mysql.com
746251a47c
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-18 10:49:28 -07:00
jimw@mysql.com
e284a57c88
Merge mysql.com:/home/jimw/my/mysql-4.1-13334
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-18 09:45:12 -07:00
ranger@regul.home.lan
366b7017e4
Added initial support of stress testing. Now it is possible to start stress test from mysql-test-run script.
...
For details see README.stress
2005-10-18 19:26:31 +03:00
jani@ua141d10.elisa.omakaista.fi
1b7a4abf59
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-10-18 18:04:00 +03:00
jani@ua141d10.elisa.omakaista.fi
8e1dac44b4
Some fixes to avoid compiler warnings.
2005-10-18 18:03:26 +03:00
msvensson@neptunus.(none)
05e63b96b0
Add file mysql-test/include/common-tests.inc
2005-10-18 15:38:32 +02:00
sergefp@mysql.com
d6903c4566
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug12915-r2
2005-10-18 14:08:50 +04:00
gluh@eagle.intranet.mysql.r18.ru
7ccf861242
Fix for bug#13783 mysqlcheck tries to optimize and analyze information_schema
...
'information_schema' is excluded from list of databases for mysqlcheck command
2005-10-18 14:25:03 +05:00
jimw@mysql.com
31a79ee3d0
Fix Item_func_abs::fix_length_and_dec() to set maybe_null properly. (Bug #14009 )
2005-10-17 17:00:42 -07:00
petr@mysql.com
ee8e163776
fix for im_life_cycle test: replace im instance port number with a constant string.
...
The lack of this --replace resulted in the test failing on all build hosts
2005-10-18 00:48:34 +04:00
kent@mysql.com
cb034d23cb
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-17 19:05:37 +02:00
pem@mysql.com
ddc36a2784
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/bug7049/mysql-5.0
2005-10-17 15:12:38 +02:00
pem@mysql.com
e585315703
Additional fix for BUG#7049, after review.
...
Make sure "select" aborts when finding a SP condition handler beyond the current scope.
2005-10-17 15:07:47 +02:00
kent@mysql.com
9e4e6de826
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-17 13:58:46 +02:00
hf@deer.(none)
15fbd07a22
Fix for bug #13820 (No warning on log(NEGATIVE))
2005-10-17 12:32:22 +05:00
kent@mysql.com
7635353bc8
mysql-test-run.pl:
...
Added --skip-im option handling
Don't terminate script if IM fails to create PID file
mtr_cases.pl:
Added --skip-im option handling
mtr_process.pl:
Kill left over 'mysqld' processes started by IM
2005-10-16 20:51:19 +02:00
evgen@moonbone.local
35e1684206
sp-security.result, sp.result, sp-security.test, sp.test:
...
Test for bug#12812 moved from sp.test to sp-security.test
2005-10-16 22:47:19 +04:00
petr@mysql.com
9333902613
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-10-16 19:37:21 +04:00
petr@mysql.com
1b0566c20b
portability fix: sh does not support "==". This resulted in IM tests failing on range of platforms.
2005-10-16 19:30:10 +04:00
kent@mysql.com
00b535280d
mysql-test-run.pl:
...
Put socket files into $opt_tmpdir, to avoid problems
with platforms that can't handle long socket paths.
2005-10-16 17:05:14 +02:00
kent@mysql.com
85ab53357b
thread_registry.h, thread_registry.cc:
...
Add explicit Thread_info::Thread_info() and move both
initializers out of class definition, to solve link
problem on QNX
Makefile.am:
Preserve executable mode on scripts
make_binary_distribution.sh:
Copy *.imtest files
2005-10-16 06:49:19 +02:00
hf@deer.(none)
9910198aaf
Additional fix for bug #12267 (Can't use POINT for primary key)
2005-10-15 22:23:13 +05:00
hf@deer.(none)
3f76925d06
Fix for bug #13573 (wrong data inserted for too big decimals)
2005-10-15 21:57:32 +05:00
hf@deer.(none)
7fb1ffd07e
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.12267
2005-10-15 21:05:29 +05:00
joerg@mysql.com
58f2a6aa64
Change the "Password" column type for the Perl suite running the tests. bug#14023
2005-10-14 13:35:36 +02:00
bar@mysql.com
a3eea8849c
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-10-14 14:02:21 +05:00
bar@mysql.com
3369f5bd89
Merge mysql.com:/usr/home/bar/mysql-4.1.b13145
...
into mysql.com:/usr/home/bar/mysql-4.1
2005-10-14 13:57:38 +05:00
bar@mysql.com
7f734c168a
Merge mysql.com:/usr/home/bar/mysql-5.0.b12547
...
into mysql.com:/usr/home/bar/mysql-5.0.char1
2005-10-14 13:37:19 +05:00
bar@mysql.com
25e40bd403
ctype_utf8.result:
...
after merge fix
,
2005-10-14 13:24:21 +05:00
bar@mysql.com
0bf436a058
Merge mysql.com:/usr/home/bar/mysql-4.1.b13751
...
into mysql.com:/usr/home/bar/mysql-5.0.char1
2005-10-14 12:07:13 +05:00
bar@mysql.com
5df9c6c2a3
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b13751
2005-10-14 11:54:10 +05:00
bar@mysql.com
58343bede3
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b13751
2005-10-14 09:09:25 +05:00
bar@mysql.com
8bd1ccc642
Merge abarkov@bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.char1
2005-10-14 08:20:02 +05:00
patg@krsna.patg.net
e13ffdae40
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-build/mysql-5.0
2005-10-13 15:41:52 -07:00
jimw@mysql.com
bae1154235
Fix calculation of TIMESTAMPDIFF() of months and years. (Bug #13534 )
2005-10-13 15:32:31 -07:00
evgen@moonbone.local
aff8dbe130
Fix bug #13855 select distinct with group by caused server crash
...
DISTINCT wasn't optimized away and caused creation of tmp table in wrong
case. This result in integer overrun and running out of memory.
Fix backported from 4.1. Now if optimizer founds that in result be only 1
row it removes distinct.
2005-10-14 01:22:24 +04:00
monty@mysql.com
3da5f1c223
Move handling of suffix_length from strnxfrm_bin() to filesort to ensure proper sorting of all kind of binary objects
...
field::sort_key() now adds length last for varbinary/blob
VARBINARY/BLOB is now sorted by filesort so that shorter strings comes before longer ones
Fixed issues in test cases from last merge
2005-10-14 00:04:52 +03:00
bell@sanja.is.com.ua
6d6e107f12
- set 'updating' in both tables list if we have two of them (because of subquery) (BUG#13236)
...
- fixed test
2005-10-14 00:02:38 +03:00
patg@krsna.patg.net
d86f40650f
BUG# 13146
...
Re-application of patch to clean 5.0 tree. Fixed issue with ANSI quotes
when dumping triggers
2005-10-13 13:42:56 -07:00
jimw@mysql.com
8ae2cfb0f7
Force a server restart for the not_embedded_server test to satisfy
...
conditions of its first test. (Bug #13796 )
2005-10-13 11:10:45 -07:00
monty@mysql.com
6f5baa1eba
Merge mysql.com:/home/my/mysql-4.1
...
into mysql.com:/home/my/mysql-5.0
2005-10-13 20:18:37 +03:00
bar@mysql.com
fee9c13568
Merge abarkov@bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b9278
2005-10-13 22:18:35 +05:00
jani@ua141d10.elisa.omakaista.fi
3ef920a7c7
Merged from 4.1.
2005-10-13 19:34:15 +03:00
bar@mysql.com
bf1a3bc030
select.result, mysqldump-max.result:
...
after merge fix.
range.result:
fixing result accordingly
,
cast.result:
after merge fix
range.test:
Avoid SELECT'ing of BINARY column not to output 0x00 bytes.
2005-10-13 21:28:44 +05:00
jani@ua141d10.elisa.omakaista.fi
2dd1e4f94e
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-10-13 18:23:53 +03:00
hf@deer.(none)
27d8bc5b1f
merging
2005-10-13 19:51:07 +05:00
hf@deer.(none)
62ffbea5e4
merging
2005-10-13 19:31:09 +05:00
bar@mysql.com
fa0dec7531
Merge abarkov@bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.char1
2005-10-13 19:27:44 +05:00
bar@mysql.com
7c81d7fc69
ctype_utf8.result, ctype_utf8.test:
...
New syntax: CHAR(x USING charset)
Adding test case.
sql_yacc.yy:
New syntax: CHAR(x USING charset)
Adding new parser rule.
item_strfunc.h:
New syntax: CHAR(x USING charset)
Adding a new constructor.
2005-10-13 19:24:47 +05:00
hf@deer.(none)
c933505d2d
Fix for bug #3874 (Group by field is not considered)
2005-10-13 19:23:52 +05:00
bar@mysql.com
c229567887
Merge abarkov@bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b9278
2005-10-13 19:19:05 +05:00
bar@mysql.com
39b0712cf7
type_binary.result, type_binary.test:
...
new file
mysql_fix_privilege_tables.sql, mysql_create_system_tables.sh:
Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
Many files:
Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
Adding true BINARY/VARBINARY: new pad_char structure member.
ctype-bin.c:
Adding true BINARY/VARBINARY: new pad_char structure member.
New strnxfrm, with two trailing length bytes.
field.cc:
Adding true BINARY/VARBINARY.
2005-10-13 19:16:19 +05:00
msvensson@neptunus.(none)
1fc54b1045
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug12698/my41-bug12698
2005-10-13 15:53:02 +02:00
msvensson@neptunus.(none)
b81f3ef1ef
Bug #12698 abnormal program termination running mysql_client_test
...
- Move test for bug#93 from mysql_client_test.c to show_check.test
- No need for test written in c
2005-10-13 15:52:22 +02:00
evgen@moonbone.local
818c37ac68
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/13535-bug-4.1-mysql
2005-10-13 17:17:32 +04:00
evgen@moonbone.local
fbd5140f2b
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/7672-bug-5.0-mysql
2005-10-13 17:11:18 +04:00
kent@mysql.com
d0922679e0
Merge
2005-10-13 14:35:53 +02:00
kent@mysql.com
ab22636120
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-10-13 14:23:37 +02:00
evgen@moonbone.local
4d2a58f848
Manual merge of bug fix #7672
2005-10-13 16:00:26 +04:00
bar@mysql.com
ade90d49e5
Merge abarkov@bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b12547
2005-10-13 16:21:35 +05:00
konstantin@mysql.com
5269826383
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-12736
2005-10-13 14:46:57 +04:00
kent@mysql.com
7743016908
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-13 12:38:38 +02:00
kent@mysql.com
2747a73857
Merge
2005-10-13 12:23:50 +02:00
kent@mysql.com
5b448a8d9f
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-13 12:09:39 +02:00
msvensson@neptunus.(none)
cf987efb35
Updated after testing
2005-10-13 11:28:06 +02:00
elliot@mysql.com
a93780b23d
BUG#13343 CREATE|etc TRIGGER|VIEW|USER don't commit the transaction (inconsistency)
...
Updated more DDL statements to cause implicit commit.
2005-10-13 05:12:17 -04:00
bar@mysql.com
ff3be543c9
Merge abarkov@bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b12547
2005-10-13 14:07:41 +05:00