jimw@mysql.com
d6db387aea
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-31 19:12:16 -07:00
jimw@mysql.com
c3f4ecb544
Merge mysql.com:/home/jimw/my/mysql-4.1-7156
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-31 18:34:16 -07:00
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
jimw@mysql.com
1d997477aa
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-31 15:24:06 -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
evgen@moonbone.local
41fc00641c
create.test, create.result, sql_select.cc, item.cc:
...
After merge fix for bug #12537
2005-08-31 22:06:34 +04:00
evgen@moonbone.local
f917803e0c
Manual merged
2005-08-31 21:24:25 +04:00
jimw@mysql.com
37bf8394ab
Add test for madvise() being declared in C++ code, because it is not
...
on Solaris even though it is available, and declare it ourselves in
that case. (Bug #7156 )
2005-08-31 10:08:55 -07: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
SergeyV@selena.
341eac5d25
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into selena.:H:/MYSQL/src/#11815-mysql-5.0
2005-08-31 18:44:02 +04: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
sergefp@mysql.com
04d75ab6e8
Fix group_min_max.test - myisam may return slightly row count estimate on amd64
2005-08-31 13:23:24 +04:00
ramil@mysql.com
a16da25e06
Merge mysql.com:/usr/home/ram/work/4.1.b9613
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-08-31 10:25:00 +05:00
kent@mysql.com
01f3a901a9
configure.in:
...
Changed back to 5.0.13-beta
2005-08-31 03:45:04 +02:00
kent@mysql.com
5f7ce18fb1
mysql-test-run.pl:
...
Put back unused old manager dummy arguments, some scripts use them
2005-08-31 03:38:33 +02:00
kent@mysql.com
85ed1e8da7
Makefile.am:
...
Make dist copy of .imtest files not fail the make target, as there are no files yet
2005-08-31 02:25:28 +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
14d0c25fc5
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/12489-bug-5.0-mysql
2005-08-31 01:07:19 +04:00
evgen@moonbone.local
dc53ac6d1f
Fix bug #12489 wrongly printed strcmp() function results in creation of broken
...
view.
For Item_func_strcmp print() was not defined and for this class was called
print_op of it's parent class. Because of this strcmp() was printed wrongly
and this results int creation of broken view.
Added function Item_func_strcmp::print() which correctly prints strcmp()
function.
2005-08-31 00:54:41 +04:00
anozdrin@mysql.com
e7305b8cab
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-im-tests-fw
2005-08-31 00:29:29 +04: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
paul@kite-hub.kitebird.com
e55126d04d
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2005-08-30 13:49:46 -05:00
SergeyV@selena.
3fdd500288
Fixes bug #11815 . Convert file path to UNIX format to build correct query
...
string while replicating LOAD DATA INFILE statement.
2005-08-30 22:19:15 +04:00
paul@kite-hub.kitebird.com
dfc55d2142
ha_innodb.cc:
...
Reorder out-of-order status variables
2005-08-30 13:17:50 -05:00
paul@kite-hub.kitebird.com
16e879e837
mysqld.cc:
...
Reorder out-of-order status variables
2005-08-30 13:16:40 -05:00
paul@kite-hub.kitebird.com
939c7c687d
set_var.cc:
...
Reorder out-of-order system variables
2005-08-30 13:15:43 -05:00
brian@zim.(none)
2b0c81c984
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-08-30 11:07:48 -07:00
brian@zim.(none)
bd806f786e
Fix for bad merge.
2005-08-30 11:04:23 -07:00
paul@kite-hub.kitebird.com
19af7f8973
Manual merge.
2005-08-30 12:12:12 -05:00
paul@kite-hub.kitebird.com
9cedc58427
Merge kite-hub.kitebird.com:/tmp/merge-4.1
...
into kite-hub.kitebird.com:/tmp/merge-5.0
2005-08-30 12:11:11 -05:00
brian@zim.(none)
3091eb3fa4
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-08-30 08:28:55 -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
sergefp@mysql.com
f29bebe216
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug12720
2005-08-30 16:34:40 +04: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
ingo@mysql.com
3e06800b7f
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-08-30 12:35:37 +02:00