brian@zim.(none)
efb5ed5bab
Merge
2005-06-01 18:48:29 -07:00
kent@mysql.com
f889f0884c
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-06-02 02:57:18 +02:00
kent@mysql.com
bd48eed988
tztime.cc:
...
Set #pragma implementation" earlier
Many files:
Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
2005-06-02 02:43:32 +02:00
brian@zim.(none)
ba9b9f8993
Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina.
2005-06-01 17:34:10 -07:00
jimw@mysql.com
ed18369236
Fix --with-bdb to be --with-berkeley-db in BUILD/SETUP.sh
2005-06-01 16:16:25 -07:00
jimw@mysql.com
f5f88703b2
Fix compile error when HAVE_BERKELEY_DB
2005-06-01 16:03:41 -07:00
jimw@mysql.com
fb51d6eca5
Update results of test after merge of bugfix
2005-06-01 14:35:02 -07:00
jimw@mysql.com
d4be534815
Merge mysql.com:/home/jimw/my/mysql-4.1-8572
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 13:03:13 -07:00
jimw@mysql.com
b8f3c515ba
Merge mysql.com:/home/jimw/my/mysql-4.1-9660
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 13:02:26 -07:00
jimw@mysql.com
4f6db49795
Merge mysql.com:/home/jimw/my/mysql-4.1-10944
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 13:00:32 -07:00
jimw@mysql.com
0a2d95e983
Merge mysql.com:/home/jimw/my/mysql-4.1-8135
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 12:59:11 -07:00
jimw@mysql.com
7ac7bfc3c8
Fix handling of NULL fields in FIELD(). (Bug #10944 )
2005-06-01 09:48:25 -07:00
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
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
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
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
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
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
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
lenz@mysql.com
25273706b8
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-05-27 18:18:07 +02:00
serg@serg.mylan
f9e9406b40
forgotten s/__GNUC__/USE_PRAGMA_INTERFACE/ causes compilation faliures
2005-05-27 14:15:08 +02:00
serg@serg.mylan
324c20d41c
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-05-27 12:48:36 +02:00
serg@serg.mylan
d21b8d1077
don't downgrade the lock for CREATE ... SELECT (bug#6678)
2005-05-27 12:38:29 +02:00
lenz@mysql.com
53e49d0521
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-05-27 09:52:03 +02:00
msvensson@neptunus.(none)
dbcf3b3a2e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-26 20:02:21 +02:00
jimw@mysql.com
1cc23599c2
Cleanups to patch for bug #9660 after review by Monty.
2005-05-26 10:01:26 -07:00
bell@sanja.is.com.ua
68899decc2
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-05-26 19:32:58 +03:00
joerg@mysql.com
db8368fdd5
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/M40/mysql-4.0
2005-05-26 18:24:17 +02:00
joerg@mysql.com
55fe5aaa47
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-05-26 18:20:17 +02:00
bell@sanja.is.com.ua
b186d8b4f9
merge
2005-05-26 18:33:57 +03:00
bell@sanja.is.com.ua
db2ce1edf6
fixed problem with long string results of expressions in UNIONS (BUG#10025)
2005-05-26 17:30:12 +03:00
marko@hundin.mysql.fi
5d0bc0b482
Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
...
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-05-26 15:57:24 +03:00
marko@hundin.mysql.fi
2d5b96798f
InnoDB: Check all referencing tables in DROP DATABASE (Bug #10335 ).
2005-05-26 15:42:24 +03:00
msvensson@neptunus.(none)
6c00006d2c
Fix icc compiler warning
2005-05-26 12:12:36 +02:00
msvensson@neptunus.(none)
975ca22872
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-26 12:10:05 +02:00
msvensson@neptunus.(none)
83d430353e
Add ifdefs to control when "#pragma implementation" should be used
...
Added some more ifdefs for "#pragma interface"
2005-05-26 12:09:14 +02:00
lenz@mysql.com
c58535f6d3
- merged the 4.1.12a Changes back into the main tree
2005-05-26 11:43:47 +02:00
jimw@mysql.com
aac55df4f4
Fix table renaming to not lowercase table names for all storage
...
engines when lower_case_table_names == 2, as it did previously
for InnoDB and MEMORY. (Bug #9660 )
2005-05-25 20:26:40 -07:00
joerg@mysql.com
830d25d985
Manual merge.
2005-05-25 18:11:03 +02:00
joerg@mysql.com
0d121fe01a
Added a missing "make clean" to the RPM "spec" file which had caused the original 4.1.12 RPMs to be broken.
...
(bug#10674, bug#10681)
2005-05-25 16:24:07 +02:00
monty@mysql.com
6d5d6c9257
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-05-25 12:57:29 +03:00
monty@mysql.com
fb90aaa7b5
Cleanup during code review
...
Faster detection of wrong table names (like PRN) on windows
2005-05-25 12:56:47 +03:00
msvensson@neptunus.(none)
0ed2e57731
Use one err file for each master
2005-05-25 11:10:10 +02:00