mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
18645 commits 2781 branches 343 tags 1.6 GiB
Commit graph

18645 commits

This branch
This branch
All branches
Author SHA1 Message Date
acurtis@xiphis.org
72f9abbf76 Add comments 2005-05-24 13:38:46 +01:00
lenz@mysql.com
f449519a47 - Backport of the patch to fix BUG#10687 (Merge engine fails 
on Windows): applied required patches on top of the 4.1.12
  release (will be published as 4.1.12a for Windows)
 2005-05-24 14:30:22 +02: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
93565c8e7d Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1 2005-05-24 01:09:23 +02:00
gbichot@bk-internal.mysql.com
76a20eb397 marking the file gone again to hopefully get the tree on its feet 2005-05-23 23:54:39 +02:00
reggie@mdk10.(none)
3384ecc988 BUG# 9148 Denial of service 
fixups of test case and comment formatting
 2005-05-23 14:48:25 -05: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
msvensson@neptunus.(none)
548994aa7b Build fixes for icc, compile _without_ "-no-gnu" 2005-05-23 18:53:53 +02:00
reggie@mdk10.(none)
c9e7c0fd56 BUG# 10687: MERGE Engine fails on Windows 
This is a replacement for the original patch given by Ingo.  This one comes
from Monty.
The problem is that merge files now use unix style pathnames on all 
platforms.  The merge file open code was not properly converting those
pathnames back to non-unix when necessary.
 2005-05-23 11:53:16 -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)
78b40d0a0f BUG# 9148: Denial of service 
This is a second patch needing another review.  The first patch didn't solve
the entire problem.  open and fopen on Windows will still open
files like "com1.sym" when they shouldn't.  This patch
checks that the file exists before trying to open it.
 2005-05-21 12:31:58 -05: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
brian@zim.(none)
6182241268 Additions for --add-drop-database 2005-05-20 06:56:02 -07: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)
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
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
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
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
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
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