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)
2536b5933a
fixed stupid typo that added a ! before my_access
2005-05-20 16:53:41 -05: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
ramil@mysql.com
d7a98ea7b8
Merge mysql.com:/usr/home/ram/work/mysql-4.1-build
...
into mysql.com:/usr/home/ram/work/mysql-4.1
2005-05-20 18:52:55 +05:00
ramil@mysql.com
bb9dc47d3d
a fix (bug #10757 : gis-rtree.test fails)
2005-05-20 18:48:18 +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)
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
bell@book.sanja.is.com.ua
816e84c1f6
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-18 22:58:48 +03: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
jimw@mysql.com
af557076fa
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-18 10:40:22 -07:00
jimw@mysql.com
9ef20027a6
Update mysqldump test and results
2005-05-18 09:40:12 -07:00
jimw@mysql.com
79ce5dcd90
Resolve bugfix merge
2005-05-18 09:25:06 -07:00
jimw@mysql.com
be221cc012
Small optimization to bug fix, from Monty.
2005-05-18 09:12:37 -07:00
pekka@mysql.com
6dbcd43224
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41
2005-05-18 18:05:37 +02:00
pekka@mysql.com
c054f84ae3
ndb - allow upgrade 4.1.10->4.1.12
2005-05-18 17:47:43 +02:00
bell@book.sanja.is.com.ua
b22e2aca56
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-18 16:58:37 +03:00
bell@book.sanja.is.com.ua
203881d9a9
reduced 1 server reloding during test
2005-05-18 16:41:32 +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
serg@serg.mylan
28712375d5
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-05-18 11:03:05 +02:00
serg@serg.mylan
48377eb7c4
test fixes
2005-05-18 10:57:07 +02:00
tulin@dl145c.mysql.com
13bbb3dbb3
ndberror.c:
...
updated error message for ndb
2005-05-18 10:22:27 +02:00
matt@mysql.com
8ed0aaacdf
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/data0/mysqldev/my/mysql-4.1-build
2005-05-18 04:06:27 +02: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
sergefp@mysql.com
cc13545413
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug10095
2005-05-16 22:21:19 +02:00
monty@mysql.com
8b1673f18e
Fix memory leak
2005-05-16 20:16:46 +03:00
sergefp@mysql.com
58d05b0794
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug10221
2005-05-16 14:10:02 +00:00
sergefp@mysql.com
47ad6a6daa
Some improvement in Item_int_with_ref class comment.
2005-05-16 14:06:52 +00:00
bell@book.sanja.is.com.ua
1ff9f55920
relaxed DBUG_ASSERT in Item_int_with_ref::new_item() to "any constant" (BUG#10020)
2005-05-16 12:19:10 +03:00
kent@mysql.com
63fcb5de6f
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-05-16 02:55:51 +02:00
kent@mysql.com
b076cdb208
mysqltest.c:
...
To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings
2005-05-16 01:08:42 +02:00
sergefp@mysql.com
510f662332
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/psergey/mysql-4.0-bug10095
2005-05-15 22:58:10 +02:00
sergefp@mysql.com
f08287f386
Fix for BUG#10095: {wrong query results because of incorrect constant propagation}
...
The problem: base_list::remove didn't modify base_list::last when removing
the last list element.
The fix: If we remove the last element, find the element before it (by walking
from the beginning of the list) and set base_list::last accordingly.
The list gets corrupted in both 4.0 and 4.1. There are no visible problems in
current 4.1 because current 4.1 doesn't call where_cond->fix_fields() after
constant propagation step.
2005-05-15 22:56:45 +02:00
kent@mysql.com
6374bfeb61
mysqltest.c:
...
To solve bug#6193, also reset require when using 'eval' for running query
mysql-test-run.pl:
In cleanup, remove possible soft link to var directory
2005-05-15 20:38:54 +02:00
kent@mysql.com
81b36addc9
mtr_report.pl, mtr_process.pl, mysql-test-run.pl:
...
Added option --vardir=<directory> for feature bug#10096
2005-05-15 17:22:54 +02:00
kent@mysql.com
f37bdbe059
mysql-test-run.pl:
...
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
init_db.sql:
Initial db updates
2005-05-15 07:34:09 +02:00
kent@mysql.com
221b1ccae8
mysqltest.c, mysql-test-run.sh:
...
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
mysql-test-run.sh, suppress.purify:
Use Purify suppress file
2005-05-15 06:59:34 +02:00
kent@mysql.com
a628878bbf
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
2005-05-14 23:48:15 +02:00
monty@mysql.com
763250e7db
Fixed compiler failure
2005-05-14 17:08:43 +03:00
monty@mysql.com
6588997eb8
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-05-14 16:28:52 +03:00