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
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
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
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
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
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
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
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
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
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
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
patg@radha.local
69114941cd
typo to DBUG_RETURN fixed
2005-08-26 20:29:26 +02:00
ramil@mysql.com
120dd92b03
workaround (bug #9613 : Some read-only variables are selectable, others are not).
2005-08-26 13:23:32 +05:00
patg@radha.local
6b4baf48a5
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into radha.local:/Users/patg/mysql-build/mysql-4.1
2005-08-26 03:14:56 +02:00
patg@radha.local
efff75ed1a
ha_blackhole changes, same patch as http://lists.mysql.com/internals/27878 , per brian
2005-08-26 02:09:56 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
ff5d26d777
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-25 23:24:16 +03:00
jimw@mysql.com
663d0bbdfb
Fix crash in DES_DECRYPT(NULL). (Bug #12757 )
2005-08-25 12:34:42 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
e767eb330e
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-25 12:08:26 +03:00
serg@sergbook.mysql.com
714b27c71c
merged
2005-08-25 00:08:02 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0
Several fixes for Netware.
2005-08-24 22:03:34 +03:00
monty@mishka.local
17654cd7af
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-08-24 20:55:54 +03:00
monty@mishka.local
842de6ea45
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-08-24 19:53:40 +03:00
monty@mishka.local
8e6aa0e7ea
Review fixes
2005-08-24 19:37:27 +03:00
jimw@mysql.com
006e5b770b
Merge mysql.com:/home/jimw/my/mysql-4.1-12302
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-24 08:50:12 -07:00
heikki@hundin.mysql.fi
2310ef6938
Merge hundin.mysql.fi:/home/heikki/mysql-4.0
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-08-24 17:30:25 +03:00
heikki@hundin.mysql.fi
9f72d504b4
ha_innodb.cc:
...
Fix bug #12779 : never give a row count estimate of 0 to the MySQL query optimizer, as then left join optimizer may beleive it KNOWS that the table is empty; note that this fix may change query optimization of many other queries where one table is empty; note that the proper fix would be to make the query optimizer to know that the row count estimates it receives really are just estimates, it cannot assume they are certain
2005-08-24 17:27:46 +03:00
kent@mysql.com
4d2cc6e503
Merge
2005-08-23 18:06:24 +02:00
serg@sergbook.mysql.com
1fbb96ea97
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-08-23 14:16:17 +04:00
jimw@mysql.com
f70beef6c7
Use the hostname with which the user authenticated when determining which
...
user to update with 'SET PASSWORD = ...'. (Bug #12302 )
2005-08-22 15:48:50 -07:00
evgen@moonbone.local
3831bb56df
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/11718-bug-4.1-mysql
2005-08-22 15:46:14 +04:00
serg@sergbook.mysql.com
eadb86d56f
after pull cleanup
2005-08-22 13:20:02 +04:00