Sinisa@sinisa.nasamreza.org
e409ebf143
A fix for the bug #7495
2004-12-22 21:31:17 +02:00
dlenev@mysql.com
beb2c1d909
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-smfix
2004-12-22 19:00:03 +03:00
dlenev@brandersnatch.localdomain
7b9fd879f6
Fix for bug #7458 "Microseconds are gobbled from the string result of
...
STR_TO_DATE() function if there is another format specifier after %f
in format string". Also small cleanup of STR_TO_DATE() implementation.
(After review version.)
2004-12-22 18:58:25 +03:00
pekka@mysql.com
60b79f2b7e
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41
2004-12-22 13:38:16 +01:00
pekka@mysql.com
f57153fe81
ndb: bug#7340 fix
2004-12-22 13:38:15 +01:00
bar@mysql.com
e53b446a73
Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8
...
See mysqldump.test comments for more details
2004-12-22 16:02:27 +04:00
monty@mishka.local
4f4bbfc279
Merge with 4.1
2004-12-22 13:54:39 +02:00
bar@mysql.com
57ec14d939
Bug#7302: UCS2 data in ENUM field get truncated when new column is added
2004-12-21 17:12:27 +04:00
dlenev@mysql.com
d8995eaf18
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0
2004-12-21 13:03:17 +03:00
ram@gw.mysql.r18.ru
19f3570ba8
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7281
2004-12-21 11:43:25 +04:00
ram@gw.mysql.r18.ru
dfbdbfd006
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7281
2004-12-21 10:51:11 +04:00
hf@deer.(none)
98f2a83539
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-12-21 10:31:09 +04:00
hf@deer.(none)
e91a4ce0be
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-12-21 10:26:01 +04:00
hf@deer.(none)
e5125d3e88
Fix to perform correctly with charsets in embedded server
2004-12-21 10:05:58 +04:00
sergefp@mysql.com
1e102d1aaf
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-order-bug
2004-12-21 03:02:38 +03:00
sergefp@mysql.com
0700f27ca1
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-bug6825
2004-12-21 02:32:30 +03:00
sergefp@mysql.com
88b63ab669
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/dbdata/psergey/mysql-5.0-nov-clean
2004-12-21 02:28:12 +03:00
sergefp@mysql.com
e89f5a7136
Fix for BUG#4480: In joins with SELECT_STRAIGHT_JOIN re-order tables by outer join dependency,
...
so we read dependent tables after tables they depend on (this is needed for outer joins)
2004-12-21 01:59:58 +03:00
pekka@mysql.com
aca045412e
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/space/pekka/ndb/version/my50-ndb
2004-12-20 16:52:15 +01:00
pekka@mysql.com
3d7649ca1e
ndb: index tests
2004-12-20 16:52:14 +01:00
joreland@mysql.com
c6837c2f7a
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-20 16:33:45 +01:00
pekka@mysql.com
6463a6d7cd
ndb: wl-1893: range scanning backwards, handler
2004-12-20 15:12:42 +01:00
ram@gw.mysql.r18.ru
da562b7e02
A fix (bug #7281 : RAND(RAND) crashes server).
2004-12-20 13:47:38 +04:00
dlenev@brandersnatch.localdomain
d65e78b527
Added test which covers nicely recent cleanup in derived tables
...
processing.
2004-12-20 09:55:06 +03:00
monty@mysql.com
6477b4dfd2
Merge with global tree
...
Fixed some found bugs in BIT fields
Added more test cases for BIT fields and varchar
2004-12-19 20:25:19 +02:00
guilhem@mysql.com
031474cf17
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-12-18 18:31:49 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
498c2bc46a
Fix test results
2004-12-18 15:15:41 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
1be319a708
Merge Bug#7391 from 4.0
2004-12-18 15:12:10 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
a524018ab3
Fix test
2004-12-18 11:57:17 +00:00
joreland@mysql.com
652a29711b
merge
2004-12-18 11:49:15 +01:00
monty@mysql.com
2a215c17bb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2004-12-18 12:49:14 +02:00
gluh@gluh.mysql.r18.ru
bc7860c80c
Fix for bug #7213 : information_schema: redundant non-standard TABLE_NAMES table
2004-12-18 13:49:13 +03:00
gluh@gluh.mysql.r18.ru
bf0104045d
Fix for bug #7210 : information_schema: can't access when table-name = reserved word
2004-12-18 12:48:01 +03:00
monty@mysql.com
f37fd31ddc
Merge with global tree
2004-12-18 06:05:16 +02:00
monty@mysql.com
3fb088a075
Add 0x before pointers (to help with debugging)
...
Add support for VARCHAR with 1 or 2 length bytes
Enable VARCHAR packing in MyISAM files (previous patch didn't pack data properly)
Give error if we got problems in temporary tables during a SELECT
Don't use new table generated by ALTER TABLE if index generation fails
Fixed wrong call by range_end() (Could cause an ASSERT in debug mode)
2004-12-18 05:19:21 +02:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
3047649845
Bug#7391 - Multi-table UPDATE security regression
...
Add in missing privilege checks.
Tests for the privileges.
2004-12-18 02:07:32 +00:00
guilhem@mysql.com
884663662b
Fix for BUG#7358: removing warning reporting of mysqldump 4.1.8 when calling SHOW CREATE DATABASE, as we deal almost gracefully with it
...
(back to behaviour of 4.1.7). Warning was not fatal: mysqldump continued. And the good thing is that it helped spot that starting from 4.1.7,
SHOW CREATE DATABASE failed (if --single-transaction and first db has non-empty InnoDB table and there is a second db) and thus mysqldump
produced CREATE DATABASE statements missing the CHARACTER SET clause. Removing the bug which was in the server, and the warning reporting in
mysqldump (compatibility with old servers).
2004-12-17 23:37:43 +01:00
mleich@mysql.com
c5eb9f1e4c
Delete files which were accidently created within the last push
2004-12-17 17:03:15 +01:00
ram@gw.mysql.r18.ru
0be6a5b995
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.bit.new
2004-12-17 18:07:05 +04:00
ram@gw.mysql.r18.ru
92f89369ae
bit type
2004-12-17 18:06:05 +04:00
mleich@mysql.com
4f024d2388
The BIT patch by ramil causes that the old data type BIT is no
...
longer available for most storage engines.
Therefore column c18 BIT is switched TINYINT .
2004-12-17 14:27:39 +01:00
matthias@three.local.lan
006a512f8f
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-17 11:02:44 +01:00
dlenev@brandersnatch.localdomain
325ec86ea1
Fix of test-suite failures which popped up after addition of federated
...
storage engine.
2004-12-17 12:19:31 +03:00
sergefp@mysql.com
da332aca40
Fix for BUG#6825: When calculating Item_func_neg::max_length, add 1 for '-'.
...
For numeric constants we only need to add, since the parser doesn't produce
negative numbers.
For strings we only add (we actually could substract 1 if given string is a constant
and it has '-number' form but we're not doing that because
* we set max_length bigger then necessary in other cases as well.
* the current solution is simpler and safer (bigger max_length is better then cutting out)
2004-12-17 12:14:45 +03:00
patg@patrick-galbraiths-computer.local
dac98f9b45
WL# 2094 Federated Storage Handler, added fixes per suggestions by Bar and Antony
2004-12-16 19:08:32 -08:00
patg@patrick-galbraiths-computer.local
fe17793fdb
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into patrick-galbraiths-computer.local:/Users/patg/5.0-federated
2004-12-16 18:40:25 -08:00
brian@avenger.(none)
3cf8548cd1
Merge
2004-12-16 15:44:46 -08:00
guilhem@mysql.com
f057721954
A .test for BUG#6287 "Slave skips auto_increment values in Replication with InnoDB"
...
which Heikki fixed in 4.1.8 and 4.0.23. I verified that without Heikki's patch the test fails (7 gets inserted).
Test added to 4.1 because in testsuite of 4.0 it's impossible to start slave with InnoDB.
2004-12-16 23:14:41 +01:00
joreland@mysql.com
59536a0043
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-16 22:23:34 +01:00
matthias@three.local.lan
5c4d2286d4
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-16 20:35:16 +01:00