bar@mysql.com
ae5c3ae0ba
ps.result, ctype_ucs.result, ctype_ucs.test, ps.test:
...
Bug #6351 make test failure "Unknown character set"
UCS2 related tests were moved into ctype_ucs.
2004-11-05 10:12:33 +04:00
igor@rurik.mysql.com
4df18b1aae
func_in.result, func_in.test:
...
Added a case for bug #6365 .
item_cmpfunc.cc:
Fixed bug #6365 : Server crashed when list of values
in IN predicate contains NULL while the tested field is
of the character type and not of the default set;
e.g. when f in 'f IN (NULL,'aa') belongs to binary
character set, while the default character set is latin1.
2004-11-04 20:39:52 -08:00
serg@serg.mylan
de914eb3c0
new test for bdb
2004-11-04 22:37:38 +01:00
guilhem@mysql.com
76f51406ce
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-11-04 19:19:51 +01:00
guilhem@mysql.com
1869cd9f83
Fix for BUG##5714 "Insert into MyISAM table and select ... for update]":
...
the fact that the transaction log is empty does not mean we're not in a transaction
(it could be BEGIN; SELECT * FOR UPDATE FROM ibtable: then we don't want to commit now, even if
the statement is a MyISAM update).
With a testcase.
2004-11-04 19:19:23 +01:00
wax@kishkin.ru
ff32313dd5
autocommit and changed name mysql_test_run_new
2004-11-04 21:25:51 +05:00
wax@mysql.com
bf2685a690
autocommit
2004-11-04 21:25:49 +05:00
tomas@poseidon.ndb.mysql.com
b8e9a612b3
to make sure we get the kill right on the different platforms
2004-11-04 16:24:41 +00:00
tomas@poseidon.ndb.mysql.com
08b25e9901
updated start script for ndbcluster to make better cleanup
...
changed to use new switch
2004-11-04 15:57:29 +00:00
monty@mysql.com
071001950e
Merge with 4.1 to get in latest bug fixes
2004-11-04 15:06:24 +02:00
tomas@poseidon.ndb.mysql.com
f5e5dfb2f7
just do kill instead ok kill -9
2004-11-04 13:06:22 +00:00
tomas@poseidon.ndb.mysql.com
21d86bda38
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-04 12:55:29 +00:00
mskold@mysql.com
0bd6fd7875
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-11-04 10:43:52 +01:00
mskold@mysql.com
0599b3bf2b
Fixed changes in printouts
2004-11-04 10:15:37 +01:00
tomas@poseidon.ndb.mysql.com
09501afd53
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-04 08:53:11 +00:00
ram@gw.mysql.r18.ru
75e322e21c
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6331
2004-11-04 10:24:27 +04:00
bar@mysql.com
f979603cf2
field.cc, sql_mode.result, sql_mode.test:
...
"SHOW CREATE TABLE" mysql-4.0 and mysql-3.23
compatibiliry mode change:
Check that a binary collation adds 'binary'
suffix into a char() column definition in
mysql40 and mysql2323 modes. This allows
not to lose the column's case sensitivity
when loading the dump in pre-4.1 servers.
2004-11-04 08:50:07 +04:00
guilhem@mysql.com
613c98ce3e
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-11-03 22:44:51 +01:00
mskold@mysql.com
bbb3e1c2bd
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2004-11-03 20:28:07 +01:00
pekka@mysql.com
b9ec6803ae
NDB blobs - try to handle insert-update-delete under autocommit=0
2004-11-03 20:21:56 +01:00
dlenev@mysql.com
fa21feda93
Fix for bug #6387 "Queried timestamp values do not match the inserted
...
value if server runs in time zone with leap seconds".
Now in my_gmt_sec() function we take into account difference between
our target and estimation in seconds part.
2004-11-03 17:59:03 +00:00
tomas@poseidon.ndb.mysql.com
3674c40631
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-03 17:41:31 +00:00
lars@mysql.com
424ff9741d
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/b5551-4.1-v4
2004-11-03 18:24:44 +01:00
lars@mysql.com
485de9cbb7
Fix for bug#5551 (Version 4).
...
The idea of the fix is that the administrative statements
OPTIMIZE TABLE, REPAIR TABLE and ANALYZE TABLE should not
generate binlog errors if there is no errors on the master.
2004-11-03 18:23:58 +01:00
monty@mysql.com
60691a637a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2004-11-03 18:52:03 +02:00
mskold@mysql.com
700da57918
Fix for bug#6398 update of primary key fails
2004-11-03 15:53:26 +01:00
mskold@mysql.com
6a75861173
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2004-11-03 15:34:50 +01:00
tomas@poseidon.ndb.mysql.com
0fd9d08c01
changed to use the future-proof option to ndb_mgmd
...
there was a clash in using -c, added -f as the future proof switch
2004-11-03 14:34:21 +00:00
pem@mysql.comhem.se
327eb9bbff
Various syntax fixes in sql/sql_yacc.yy for stored procedures:
...
- No RESTICT|CASCADE in DROP SP (since it's not implemented)
- Added optional "noise" to FETCH: [[NEXT] FROM]
- At least one statement required in all block constructs except BEGIN-END
(where zero is allowed)
2004-11-03 13:49:54 +01:00
tomas@poseidon.ndb.mysql.com
2356c9f995
mysql-master-run does not need to start second mysqld with innodb, add --skip-innodb
2004-11-03 11:43:46 +00:00
bar@mysql.com
45451568bf
opt_range.cc, range.result, range.test:
...
Bug #6045 : Binary Comparison regression in MySQL 4.1
Binary searches didn't use a case insensitive index, now they do.
2004-11-03 15:22:33 +04:00
monty@mysql.com
7d3be517a4
Merge on pull
2004-11-03 13:01:38 +02:00
monty@mysql.com
47bbf768d4
Fixes after merge with 4.1
...
FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
2004-11-03 12:39:38 +02:00
mskold@mysql.com
c733473d2b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2004-11-03 10:24:49 +01:00
monty@mysql.com
2185f1a56c
Remove usage of !$ from mysql-tests
...
Added protocol::flush() for easier embedded-server code
Increase block allocation variables a bit as they where a bit too small for MySQL 4.1
Added option --silent to client_test
2004-11-02 20:13:27 +02:00
timour@mysql.com
09f1c7096c
WL#1972 "Evaluate HAVING before SELECT select-list"
...
- Changed name resolution for GROUP BY so that derived columns do not shadow table columns
from the FROM clause. As a result GROUP BY now is handled as a true ANSI extentsion.
- Issue a warning when HAVING is resolved into ambiguous columns, and prefer the columns from
the GROUP BY clause over SELECT columns.
2004-11-02 18:23:15 +02:00
ram@gw.mysql.r18.ru
86b33f360b
A fix (bug #6331 : INSERT IGNORE .. SELECT breaks subsequent inserts).
2004-11-02 19:48:37 +04:00
joerg@mysql.com
7c0e191d27
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2004-11-02 16:25:48 +01:00
gluh@gluh.mysql.r18.ru
4c65a9447e
WL#1437 :don't create new users with GRANT
2004-11-02 17:45:26 +03:00
joerg@mysql.com
1b94652bde
Test expansion: "MOD" on non-integral first operand.
2004-11-02 15:09:57 +01:00
bar@mysql.com
6a3b1d443f
Many files:
...
Allow mixing of different character sets for more SQL functions.
item_func.h:
Allow mixing of different character sets for more SQL functions..
2004-11-02 16:02:12 +04:00
mskold@mysql.com
48d86d0e19
Fixed difference in EXPLAIN output
2004-11-02 10:28:39 +01:00
bar@mysql.com
bc6bbebbc8
ctype_sjis.result, ctype_sjis.test, ctype-sjis.c:
...
Bug #6223 Japanese half-width kana characters get truncated. Bytes 0xA1..0xDF were not treated as a single byte sequence in a mistake.
2004-11-02 09:00:46 +04:00
pekka@mysql.com
21984b0caa
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41
2004-11-01 15:43:54 +01:00
matthias@three.local.lan
afecfd77b5
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-11-01 10:51:43 +01:00
timour@mysql.com
157dfcf4a4
Minor fixes of the patch for BUG#6303
2004-11-01 10:12:39 +02:00
pekka@mysql.com
354739acb7
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41
2004-10-31 15:44:35 +01:00
pekka@mysql.com
0669646752
NDB bug-6018 support writeTuple with blobs
2004-10-31 15:33:56 +01:00
konstantin@mysql.com
e97a79f2ee
Enable REPLACE ... SELECT in prepared statements.
2004-10-30 17:17:52 +04:00
monty@mysql.com
afbe601302
merge with 4.1
2004-10-29 19:26:52 +03:00