lenz@mysql.com
e877e71b17
Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
2005-06-01 13:06:15 +02:00
lenz@mysql.com
7bd3dd7cb3
- removed references to some obsolete files (BUG#10824)
...
- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
spec file)
2005-06-01 12:59:10 +02:00
svoj@mysql.com
83d0ac6f25
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
2005-06-01 15:51:03 +05:00
lenz@mysql.com
92cffda595
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-06-01 12:24:00 +02:00
pem@mysql.comhem.se
85f19d5da5
Fixed BUG#10961: Stored procedures: crash if select * from dual
...
Have to catch errors from SELECT when opening a cursor.
2005-06-01 12:18:41 +02:00
mskold@mysql.com
e8613e53b9
Fixed handling of condition pushdown to storage engine of NO BETWEEN and NOT IN
2005-06-01 11:56:47 +02:00
ingo@mysql.com
0a1e38b7ed
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
...
Manual merge from 4.1.
2005-06-01 11:15:21 +02:00
serg@serg.mylan
f72841b4ed
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-01 09:35:35 +02:00
serg@serg.mylan
6e37d8c15d
FIELD_TYPE_NEWDECIMAL is numeric too
2005-06-01 09:32:05 +02:00
ramil@mysql.com
1061c412ba
merging: the patch rejected as the code differs much; should be rewritten for 5.0.
2005-06-01 11:10:30 +05:00
tim@siva.hindu.god
6077a08aab
Merge bk-internal:/home/bk/mysql-5.0
...
into siva.hindu.god:/opt/home/tim/m/50/a
2005-06-01 11:43:15 +12:00
ingo@mysql.com
effd338f67
Merge
2005-05-31 20:55:42 +02:00
ingo@mysql.com
40b53eab23
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
...
After merge fix.
2005-05-31 20:45:41 +02:00
acurtis@xiphis.org
fb10cfd08d
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into xiphis.org:/usr/home/antony/work2/p4-bug10413.2
2005-05-31 19:21:08 +01:00
ingo@mysql.com
c420599581
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
...
Hand merged from 4.0.
2005-05-31 19:37:24 +02:00
acurtis@xiphis.org
c4f37eda65
Bug#10413 - Invalid column name is not rejected
...
Stop ignoring name parts and check for validity
2005-05-31 18:06:54 +01:00
pem@mysql.comhem.se
76073d7bf5
Fixed BUG#9529: Stored Procedures: No Warning on truncation of procedure name
...
during creation.
Although it returns an error, consistent with the behaviour for other objects.
(Unclear why we would allow the creation of SPs with truncated names.)
2005-05-31 18:36:32 +02:00
svoj@mysql.com
01f4036989
WL#2286 - Compile MySQL w/YASSL support
...
merge with latest yaSSL, move templates instantiation into separate file where it is possible
2005-05-31 20:56:32 +05:00
igor@rurik.mysql.com
da6c4bd5b1
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-05-31 06:00:41 -07:00
igor@rurik.mysql.com
a7d28e20aa
olap.result:
...
Fixed bug #10982 .
item.cc:
Fixed bug #10982 . In the function Item_ref::val_decimal
by mistake the method Item_ref::val_decimal was used
instead of Item_ref::val_decimal_result.
2005-05-31 05:56:22 -07:00
monty@mysql.com
e253b7815a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-05-31 15:22:44 +03:00
igor@rurik.mysql.com
13351aae48
olap.result:
...
Post merge corrections.
2005-05-31 04:49:52 -07:00
pem@mysql.comhem.se
7eaf78de85
Small bug fix in SP item reusal (debug mode only).
2005-05-31 13:12:23 +02:00
pem@mysql.com
53abbdc39b
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-05-31 12:07:16 +02:00
pem@mysql.comhem.se
063896a6e7
Post-review fixes of BUG#9937: Crash on call to stored procedure.
2005-05-31 12:06:15 +02:00
monty@mysql.com
bfcf3c6ac9
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-05-31 12:29:24 +03:00
ingo@mysql.com
51d80960ea
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
...
1.) Added a new option to mysql_lock_tables() for ignoring FLUSH TABLES.
Used the new option in create_table_from_items().
It is necessary to prevent the SELECT table from being reopend.
It would get new storage assigned for its fields, while the
SELECT part of the command would still use the old (freed) storage.
2.) Protected the CREATE TABLE and CREATE TABLE ... SELECT commands
against a global read lock. This prevents a deadlock in
CREATE TABLE ... SELECT in conjunction with FLUSH TABLES WITH READ LOCK
and avoids the creation of new tables during a global read lock.
3.) Replaced set_protect_against_global_read_lock() and
unset_protect_against_global_read_lock() by
wait_if_global_read_lock() and start_waiting_global_read_lock()
in the INSERT DELAYED handling.
2005-05-31 11:08:14 +02:00
gluh@mysql.com
ea5c256b27
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Merge/mysql-5.0
2005-05-31 13:17:07 +05:00
gluh@eagle.intranet.mysql.r18.ru
ddf91f0689
Fix for bug#10059: SHOW TABLE STATUS FROM information_schema
; reports uppercase table names
...
information schema table names are always upper case table names
2005-05-31 13:15:23 +05:00
lenz@mysql.com
0c84ee9545
Merge mysql.com:/space/my/mysql-5.0.6-clone
...
into mysql.com:/space/my/mysql-5.0-build
2005-05-31 09:30:36 +02:00
lenz@mysql.com
cc20ad016d
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-05-31 09:07:11 +02:00
ramil@mysql.com
cc0061a122
a fix (bug #7405 : group_concat with distinct and rollup => ignores distinct in some rows).
2005-05-31 10:54:33 +05:00
konstantin@mysql.com
19b8379af6
One more post-review fix.
2005-05-30 21:49:59 +04:00
monty@mysql.com
7538ce70d5
Fixed bug in multiple-table-delete where some rows was not deleted
2005-05-30 20:48:40 +03:00
konstantin@mysql.com
ca6645d852
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-7306-new
2005-05-30 21:47:20 +04:00
lenz@mysql.com
791c936bbd
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-05-30 19:17:42 +02:00
konstantin@mysql.com
e315f903d0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-7306-new
2005-05-30 20:56:11 +04:00
konstantin@mysql.com
2d6a70c42a
Preparatory (and the most problematic) patch for Bug#7306
...
"the server side preparedStatement error for LIMIT placeholder",
which moves all uses of LIMIT clause from PREPARE to OPTIMIZE
and later steps.
After-review fixes.
2005-05-30 20:54:37 +04:00
dlenev@mysql.com
90d97c1d0b
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-ttdf
2005-05-30 18:59:24 +04:00
dlenev@brandersnatch.localdomain
abfc5b3903
Added test for bug #5894 "Triggers with altered tables cause corrupt
...
databases" and basic handling of errors which happen in triggers.
(The bug itself was fixed by several previous patches).
Fixed bug in multi-delete which were exposed by these tests.
2005-05-30 18:55:56 +04:00
igor@rurik.mysql.com
f987085aa4
Manual post merge
2005-05-30 05:47:50 -07:00
igor@rurik.mysql.com
e8a6fa4278
sql_select.cc:
...
Post-review modifications for the fix of bug #7894 .
2005-05-30 05:25:12 -07:00
igor@rurik.mysql.com
10cc5a46df
olap.result, olap.test:
...
Added test cases for bug #7894 .
sql_select.cc:
Fixed bug #7894 : GROUP BY queries with ROLLUP returned
wrong results for expressions containing group by columns.
The fix ensured correct results by replacement of all
occurrences of group by fields in non-aggregate expressions
for corresponding ref objects and preventing creation of
fields in temporary tables for expression containing group
by fields.
2005-05-30 03:01:51 -07:00
pem@mysql.com
e496b24304
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-05-30 11:06:31 +02:00
evgen@moonbone.local
329d974df7
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/mysql-5.0-bug-9593
2005-05-30 03:34:20 +04:00
evgen@moonbone.local
077086cd96
Fix bug #9593 "The combination of COUNT, DISTINCT and CONCAT seems to lock the
...
server"
Bug appears only on Windows platform. Freeing memory in
TMP_TABLE_PARAM::cleanup() allocated by new Copy_fields[0] in
setup_copy_fields() results in memory destruction. In test IF used instead
of CONCAT because IF have more stable crash.
2005-05-30 03:32:50 +04:00
serg@serg.mylan
6ef172efb8
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-05-28 10:44:49 +02:00
patg@radha.local
019288c623
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Users/patg/mysql-5.0
2005-05-28 09:00:29 +02:00
jimw@mysql.com
2f0c098ef5
Fix '%h', '%I', and '%l' format specifiers in TIME_FORMAT()
...
to handle large time values as documented. (Bug #10590 )
2005-05-27 16:41:53 -07:00
serg@serg.mylan
29d6af8d9a
merged
2005-05-28 01:28:18 +02:00