jimw@mysql.com
0ebf1576dc
Merge mysql.com:/home/jimw/my/mysql-4.1-12325
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-31 18:32:45 -07:00
jimw@mysql.com
00b17c1c17
Fix handling of filenames that start the same as reserved filenames
...
on Windows. (Bug #12325 )
2005-08-31 18:32:15 -07:00
tomas@poseidon.ndb.mysql.com
e0f3c5c0fb
Bug #12043 , do not core on misconfig unless debug compiled
2005-09-01 00:13:01 +02:00
tomas@poseidon.ndb.mysql.com
29dc269678
Bug#12833 corrected parsing of CLUSTERLOG command in ndb_mgm
2005-08-31 23:56:02 +02:00
tomas@poseidon.ndb.mysql.com
f1b97218f1
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-08-31 23:31:02 +02:00
tomas@poseidon.ndb.mysql.com
ce91c0f1c8
added make of ndb sys file printer
2005-08-31 23:24:50 +02:00
evgen@moonbone.local
c23c1dc314
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/12861-bug-4.1-mysql
2005-09-01 01:08:59 +04:00
tomas@poseidon.ndb.mysql.com
9a91368997
improved the ndb redo log reader
2005-08-31 23:08:58 +02:00
tomas@poseidon.ndb.mysql.com
298af8ccb9
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-08-31 18:50:33 +02:00
evgen@moonbone.local
f1fb30a15f
Fix bug #12861 client hang with group_concat insubquery FROM DUAL.
...
Item_func_group_concat::fix_fields() set maybe_null flag to 0, and set it to
1 only if some of it's arguments may be null. When used in subquery in tmp
table created field which can't be null. When no data retireved result field
have to be set to null and error mentioned in bug report occurs. Also this
bug can occur if selecting from not null field in empty table.
Function group_concat now marked maybe_null from the very beginning not only
if some of it's argument may be null.
2005-08-31 18:26:50 +04:00
tomas@poseidon.ndb.mysql.com
2b11fdba34
improved error message printing on filesystem refuse signals
2005-08-31 16:15:03 +02:00
heikki@hundin.mysql.fi
183feee465
ha_innodb.cc:
...
Fix bug #12410 : InnoDB was too permissive with LOCK TABLE ... READ LOCAL, and alowed new inserts to the table; we now make READ LOCAL equivalent to READ for InnoDB; note that this will cause slightly more locking in mysqldump, but makes the InnoDB table dumps consistent with MyISAM table dumps; note that the real code change patch was accidentally pushed with my another patch 5 minutes ago
2005-08-31 14:27:44 +03:00
heikki@hundin.mysql.fi
9aa5a86a80
ha_innodb.cc:
...
Fix bug #12852 : do not increment the open handle count to a table if the table does not have an .ibd file and InnoDB decides to return an error from the ::open() function; then the table can be dropped even if the user has tried to open it
2005-08-31 14:17:05 +03:00
tomas@poseidon.ndb.mysql.com
b9506c2324
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-08-31 13:10:35 +02:00
tomas@poseidon.ndb.mysql.com
6b4170ab10
corrected some erroneous ndb error messages
2005-08-31 13:09:18 +02:00
jimw@mysql.com
b5c01d7971
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-30 14:36:07 -07:00
evgen@moonbone.local
6ed7255448
manual merge of bug fix#12537
2005-08-30 23:29:47 +04:00
jimw@mysql.com
513e24be9e
Merge mysql.com:/home/jimw/my/mysql-4.1-12828
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-30 12:25:50 -07:00
jimw@mysql.com
bdb2fa360a
Merge mysql.com:/home/jimw/my/mysql-4.1-12757
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-30 12:25:15 -07:00
jimw@mysql.com
0dc444ec4e
Fix incorrect spellings of "dropped" in source and tests. (Bug #12828 )
2005-08-30 12:24:37 -07:00
brian@zim.(none)
16e30aaf68
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-08-30 08:28:34 -07:00
ramil@mysql.com
dba11de02a
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b9613
2005-08-30 17:32:53 +05:00
evgen@moonbone.local
d76f9471cb
Fix bug #12537 UNION produces longtext instead of varchar
...
Item::tmp_table_field_from_field_type() and create_tmp_field_from_item()
was converting string field to blob depending on byte-wise length instead of
character length, which results in converting valid varchar string with
length == 86 to longtext.
Made that functions above take into account max width of character when
converting string fields to blobs.
2005-08-30 16:19:53 +04:00
ramil@mysql.com
d9658e9e3c
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b9613
2005-08-30 14:23:06 +05:00
ingo@mysql.com
941f458e56
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-08-30 11:09:51 +02:00
ramil@mysql.com
00e066e201
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b9613
2005-08-30 12:33:58 +05:00
jonas@eel.(none)
d61780999b
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-30 08:59:17 +02:00
jonas@eel.(none)
91086d663c
Merge eel.(none):/home/jonas/src/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-30 08:57:30 +02:00
jonas@eel.(none)
4cc90aaab8
bug#12862 - ndb compile error
...
fix typo
2005-08-30 08:56:46 +02:00
ingo@mysql.com
3683432917
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-08-30 08:17:44 +02:00
pgalbraith@mysql.com
162353250e
ha_blackhole.cc:
...
Found one more missing DBUG_ENTER. compile-pentium-debug-max does not enable blackhole on 4.1!
2005-08-30 02:46:03 +02:00
brian@zim.(none)
ab126a8130
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-08-29 17:41:09 -07:00
brian@zim.(none)
4e9931752e
Added support for delete_all_rows() for archive. This fixes bug #12836 .
2005-08-29 15:05:16 -07:00
pgalbraith@mysql.com
9f45c8f2fe
ha_blackhole.cc:
...
Added missing DBUG enter, compiled and tested on production with debug-max
build (my regular build missed the previous errors friday)
Changeset:
Added missing DBUG_ENTER, compiled and tested on production with debug-max
build!
2005-08-29 21:22:06 +02:00
ingo@mysql.com
ae7e8b1de6
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-08-29 21:10:25 +02:00
paul@frost.snake.net
6b265793c3
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
2005-08-29 11:25:12 -05:00
tomas@poseidon.ndb.mysql.com
dba2e0074b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-08-29 18:25:11 +02:00
tomas@poseidon.ndb.mysql.com
60df5fffb3
updated ndb redo file reader with schemaversion in commit rcord instead of prepare record
2005-08-29 18:23:53 +02:00
ingo@mysql.com
330eb04536
Bug#12296 - CHECKSUM TABLE reports 0 for the table
...
Skipping deleted records instead of breaking the loop
during checksum calculation.
2005-08-29 17:08:41 +02:00
ingo@mysql.com
32e3238da7
Bug#11816 - Truncate table doesn't work with temporary innodb tables
...
Handle temporary tables like permanent tables: If the storage engine
cannot truncate, delete instead.
2005-08-29 17:01:46 +02:00
ingo@mysql.com
674f8dfa7c
Bug#11493 - Alter table rename to default database does not work without db name qualifying
...
Supplied the default database name for ALTER TABLE ... RENAME
for the new table instead of the old tables db like we do for
other ALTERs.
2005-08-29 16:54:33 +02:00
ingo@mysql.com
5c14b35a7f
Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table
...
Changed end-space comparison so that the key is not used past
its end. This is due to the new end-space behaviour in 4.1.
See also bug 6151 and 9188.
2005-08-29 16:50:09 +02:00
bar@mysql.com
96e0cb8cbf
ctype_utf8.result, ctype_utf8.test, item.cc:
...
Bug#12371 executing prepared statement fails (illegal mix of collations)
After review fixes.
2005-08-29 16:49:01 +05:00
bar@mysql.com
be470c38c6
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b12371
2005-08-29 15:44:49 +05:00
kent@mysql.com
88af3ceb20
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-08-28 20:03:03 +02:00
kent@mysql.com
e2954b29a1
Makefile.am:
...
Make ports configurable from environment for test
2005-08-28 19:46:56 +02:00
paul@frost.snake.net
39e5dafb91
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
2005-08-27 21:52:26 -05:00
paul@frost.snake.net
c0080aeba6
set_var.cc:
...
Reorder out-of-order system variables.
2005-08-27 19:20:10 -05:00
paul@frost.snake.net
458bc88563
mysqld.cc:
...
Reorder out-of-order status variables.
2005-08-27 19:18:53 -05:00
hf@deer.(none)
5b35789d12
Merge deer.(none):/home/hf/work/mysql-4.1.9645
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2005-08-27 18:06:09 +05:00