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
ingo@mysql.com
effd338f67
Merge
2005-05-31 20:55:42 +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
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
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
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
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
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
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
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
Sinisa@sinisa.nasamreza.org
df53be3dfe
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2005-05-24 19:47:18 +03:00
jani@ua141d10.elisa.omakaista.fi
ed2e508bdd
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-05-24 18:23:31 +03:00
jani@ua141d10.elisa.omakaista.fi
5254d52cb6
Added a test case for Bug#8009.
2005-05-24 17:50:17 +03:00
acurtis@xiphis.org
565c20ecbf
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into xiphis.org:/usr/home/antony/work2/p3-bug7241.5
2005-05-24 13:40:25 +01:00
acurtis@xiphis.org
72f9abbf76
Add comments
2005-05-24 13:38:46 +01:00
acurtis@xiphis.org
a6a589ef76
Bug#7241 - Invalid response when DELETE .. USING and LOCK TABLES used.
...
Only acquire necessary write lock for multi-delete
2005-05-24 11:44:34 +01:00
lars@mysql.com
a21eb5d026
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1
2005-05-23 21:05:30 +02:00
reggie@mdk10.(none)
c492ffcf2e
BUG#10687 - Merge engine fails under Windows
...
This final cset is to fix a syntax problem in ha_myisammrg.cc where a / was left out of a format string.
It also adds a check in has_path to avoid a possible redundant comparison.
ha_myisammrg.cc:
Replaced missing / in format string
my_getwd.c:
Added test to see if FN_LIBCHAR != '/' before doing comparison to avoid redundant comparison
2005-05-23 12:31:22 -05:00
reggie@mdk10.(none)
799b773aae
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-05-23 12:08:57 -05:00
reggie@mdk10.(none)
1c0da6110e
BUG# 10687: Merge engine fails under Windows
...
This cset is to roll out the cset applied earlier from Ingo.
This bug has been fixed with a different cset.
2005-05-23 12:05:15 -05:00
lars@mysql.com
4e2766ffc7
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1
2005-05-23 16:23:05 +02:00
reggie@mdk10.(none)
48c584537d
BUG# 9148: Denial of service
...
The problem was that on Windows the access method indicates that access to file
such as "com1" and "lpt1" is allowed (since they are device names) and
this causes mysql to attempt to open them as databases or tables.
The fix was to write our own my_access method that uses other Win32 functions
to determine if the given argument is indeed a file and has to requested
mode.
2005-05-20 16:04:10 -05:00
lars@mysql.com
d158d2e755
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1
2005-05-20 15:30:15 +02:00
reggie@mdk10.(none)
0e8e44e70d
BUG# 10687 - MERGE engine fails under Windows
...
This patch was submitted by Ingo and it appears to work correctly.
2005-05-19 16:02:14 -05:00
reggie@mdk10.(none)
b5a60fe2a8
This fixed a compile problem on Windows
...
sql_udf.cc:
changed dl_name to udf->dl in mysql_create_function
2005-05-19 15:18:49 -05:00
ramil@mysql.com
b9fba04f68
Merge mysql.com:/usr/home/ram/work/mysql-4.1-build
...
into mysql.com:/usr/home/ram/work/mysql-4.1
2005-05-19 23:31:40 +05:00
ramil@mysql.com
9fe71c13e0
hf's fix for bug #10626 ( gis.test fails)
2005-05-19 22:53:35 +05:00
lars@mysql.com
3e25e5867d
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1
2005-05-19 12:59:46 +02:00
lars@mysql.com
60021dbe02
CSC#4944: Adding File_size to output of SHOW BINARY lOGS
2005-05-19 12:34:15 +02:00
serg@serg.mylan
1bb2a929fb
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-05-19 09:50:43 +02:00
serg@serg.mylan
541ff258bf
after merge fix
2005-05-19 09:47:13 +02:00
serg@serg.mylan
8044488d7c
merged
2005-05-18 22:14:08 +02:00
serg@serg.mylan
2e93680773
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-05-18 21:36:46 +02:00
serg@serg.mylan
50d369bb43
udf: when banning paths from soname in CREATE FUNCTION, check for \ on windows.
...
when reporting an error, use an appropriate buffer for udf->name
2005-05-18 21:31:39 +02:00
ingo@mysql.com
21bf35fce0
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-05-18 19:45:59 +02:00
ingo@mysql.com
26f2e57ecb
Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
...
After review version.
Added a condition for MERGE tables. These do not have unique
indexes. But every key could be a unique key on the underlying
MyISAM table. So get the maximum key length for MERGE tables
instead of the maximum unique key length. This is used for
buffer allocation in write_record().
2005-05-18 19:40:39 +02:00
Sinisa@sinisa.nasamreza.org
aec54dcc7c
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2005-05-18 19:43:48 +03:00
Sinisa@sinisa.nasamreza.org
78a1688351
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2005-05-18 15:28:13 +03:00
igor@rurik.mysql.com
80aa0062db
olap.result, olap.test:
...
Added test cases for bug #7914 .
sql_select.cc:
Fixed bug #7914 : rollup over expresssions such as sum(a)+1.
2005-05-18 05:15:48 -07:00
igor@rurik.mysql.com
3199272e65
sql_yacc.yy:
...
Added missing ';'.
2005-05-18 04:17:13 -07:00
bell@book.sanja.is.com.ua
295722520f
Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1
...
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
2005-05-17 19:10:53 +03:00