Sinisa@sinisa.nasamreza.org
d110146252
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-12-23 21:11:31 +02:00
Sinisa@sinisa.nasamreza.org
3c5a325897
Fix for a bug #7495
2004-12-23 21:08:54 +02:00
dlenev@mysql.com
caade862ae
Make GRANTs, which change SSL attributes and/or user limits,
...
to behave well on 5.0 tables (well now you can't use tables from 4.1
and 5.0 with 4.0 because former use utf8, but still it is nice to have
similar code in acl_init() and replace_user_table()).
This also will make such GRANTs working in 5.0 (they are broken now).
2004-12-23 21:59:36 +03:00
serg@serg.mylan
d38db21048
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-12-23 17:40:22 +01:00
serg@serg.mylan
7960b09bca
incorrect result fixed
2004-12-23 17:32:29 +01:00
bar@mysql.com
b236841890
Take charsets from the source directory rather than
...
from the install directory.
2004-12-23 13:52:25 +04:00
tomas@poseidon.ndb.mysql.com
ed3e1bb006
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-12-22 22:48:31 +01:00
tomas@poseidon.ndb.mysql.com
263832da65
fixed so that last repeats are printed first with correct time if another message comes
...
decided for fixed size buffers in LogHandler repeated messages
2004-12-22 22:47:56 +01:00
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
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
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
ram@gw.mysql.r18.ru
da562b7e02
A fix (bug #7281 : RAND(RAND) crashes server).
2004-12-20 13:47:38 +04: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
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
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
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
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
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
joerg@mysql.com
d54d79fae3
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/M40/mysql-4.0
2004-12-16 20:29:59 +01:00
joerg@mysql.com
587584f135
Have 'mysql-test-run' write a list of all failed tests at the end, if run with '--force'.
2004-12-16 20:26:24 +01:00
timour@mysql.com
410086b347
Test for BUG#6054. The bug itsel is fixed by the fix for #5837 .
2004-12-16 18:46:38 +02:00
timour@mysql.com
cc6a30214c
Moved drop table statement to the end.
2004-12-16 18:44:39 +02:00
timour@mysql.com
53a9af8f1d
Test for BUG#6054. The bug itsel is fixed by the fix for #5837 .
2004-12-16 18:04:51 +02:00
dlenev@mysql.com
aeaeb3f022
Fix for bug #7297 "Two digit year should be interpreted correctly
...
even with zero month and day" aka "Date decoding trouble"
Two digit year should be interpreted correctly as year in 20th or 21st
century even with zero month and day. Only exception should be zero date
'00-00-00' or '00-00-00 00:00:00'.
2004-12-16 16:31:50 +03:00
matthias@three.local.lan
b91567cfcb
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 10:22:23 +01:00
ram@gw.mysql.r18.ru
a2a3d82e62
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2004-12-14 18:48:54 +04:00
ram@gw.mysql.r18.ru
d599808fbc
Clean-up.
...
TYPE=MyISAM replaced with ENGINE=MyISAM.
2004-12-14 18:47:34 +04:00
wax@kishkin.ru
e81d48fdd9
corrected mysqltest.dsp
...
corrected mysql_test_run_new.dsp
added dependency
corrected path of mysql_test_run_new.dsp
fixed wrong code
added my_create_tables.c
removed command_line
fixed #elif
restored NAME_MAX and MAX_FNAME
added create_system_files()
added compare() for windows
added all files of testes in script
added mysql-test in script
2004-12-14 18:46:55 +05:00
ram@gw.mysql.r18.ru
7c31ea4d83
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2004-12-14 16:26:10 +04:00
bar@mysql.com
4fa867494d
bug#6275 "client_test" fail in 4.1.7 make test
...
bug#6911 resultset metadata always return client character set
2004-12-14 15:58:30 +04:00
matthias@three.local.lan
621daba7b6
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-14 12:24:59 +01:00
ram@gw.mysql.r18.ru
9399fe3327
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2004-12-14 14:25:33 +04:00
tomas@poseidon.ndb.mysql.com
94b3e06dd6
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-12-14 10:24:26 +01:00
tomas@poseidon.ndb.mysql.com
ef419b3338
mysql-test-run.sh:
...
removed diskless option for ndb test
2004-12-14 10:23:35 +01:00