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

1822 commits

Author SHA1 Message Date
serg@serg.mylan
6e37d8c15d FIELD_TYPE_NEWDECIMAL is numeric too 2005-06-01 09:32:05 +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)
697cfe7f07 Merge from 4.1 2005-05-26 21:01:55 +02:00
joerg@mysql.com
9504bd0ddd Manual merge. 2005-05-26 12:51:44 +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
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
serg@serg.mylan
e2c8f63ed4 simplifying new/my_arg_new wrapping 2005-05-24 21:02:42 +02:00
lenz@mysql.com
236ca3626f - added the cp932 charset support to the Windows builds 2005-05-24 14:46:28 +02:00
msvensson@neptunus.(none)
197978e3d1 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0.6-build 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp
 2005-05-23 19:01:16 +02:00
msvensson@neptunus.(none)
548994aa7b Build fixes for icc, compile _without_ "-no-gnu" 2005-05-23 18:53:53 +02:00
msvensson@neptunus.(none)
9d0e3521f0 Build fix 2005-05-23 15:13:21 +02:00
reggie@mdk10.(none)
21133df02a fixed conflicts 2005-05-20 16:34:59 -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
bell@sanja.is.com.ua
e37fbf2382 Macos 10.4 compatibility changes 2005-05-20 16:21:23 +03:00
konstantin@mysql.com
f30f95183b Change the return type back to int (modify_defaults_file). 
This fixes a compilation failure in mysql_com.h, which doesn't have
'uint' alias visibile. Maybe worth while changing to unsigned int, but
the rest of functions that work with defaults files return int.
 2005-05-19 14:02:12 +04:00
monty@mysql.com
7ef7b9ad34 merge 2005-05-18 21:16:14 +03:00
monty@mysql.com
a9c4379c15 Fixed bug from last push 2005-05-18 21:12:59 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
c63ad3b549 New file default_modify.c. Fixed a typo on mysqld.cc 
Changed name of function my_correct_default_file to
modify_defaults_file. Improved function and fixed some
bugs in it.
 2005-05-18 20:10:17 +03:00
konstantin@mysql.com
3b5897e5e9 Fix conflicting declaration and definition of db_output (compilation 
failure).
 2005-05-18 20:30:22 +04:00
monty@mysql.com
db40af2a6f Fix warnings from icc 
Added BUILD scripts for icc
Fixed (one time) memory leak in grant handling
 2005-05-18 19:00:21 +03:00
konstantin@mysql.com
f1916b87d2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-9643
 2005-05-16 18:29:04 +04:00
konstantin@mysql.com
38d68559bf A fix and a test case for Bug#9643 " CURSOR_TYPE_SCROLLABLE dos not work" 
- check on the client the unsupported feature and return 
an error message if it's been requested.
Additionally added API support for STMT_ATTR_PREFETCH_ROWS.
Post-review fixes.
 2005-05-16 18:27:21 +04:00
petr@mysql.com
834c47f336 Merge 2005-05-16 03:01:05 +04:00
petr@mysql.com
180d0ed620 post-review fixes 2005-05-16 01:54:02 +04:00
konstantin@mysql.com
89bd09fed2 Manual merge (again) 2005-05-14 12:38:12 +04:00
georg@lmy002.wdf.sap.corp
41d284e608 added prototype for mysql_set_character_set function 2005-05-13 15:54:35 +02:00
monty@mishka.local
2d4a417330 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mishka.local:/home/my/mysql-5.0
 2005-05-13 13:36:02 +03:00
monty@mishka.local
2d25da2a4b concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file 
myisam_max_extra_sort_file_size is depricated
Ensure that myisam_data_pointer_size is honoured when creating new MyISAM files
Changed default value of myisam_data_pointer_size from 4 to 6 to get rid of 'table-is-full' errors
 2005-05-13 12:08:08 +03:00
konstantin@mysql.com
d0e24153b9 A fix and test case for Bug#9478 "mysql_stmt_attr_set mysql_stmt_execute" 
(crash on attempt to re-execute a statement with an open cursor) + 
post-review fixes.
 2005-05-12 11:16:12 +04:00
jimw@mysql.com
cde9f56b45 Merge 2005-05-09 11:28:57 -07:00
ramil@ram-book.(none)
8d30d30073 a fix (bug #10438: Raid stopped working because of change in atomic add detection). 2005-05-09 18:33:21 +05:00
msvensson@neptunus.(none)
939f18a676 Merge neptunus.(none):/home/msvensson/mysql/bug10241 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-09 11:31:27 +02:00
msvensson@neptunus.(none)
939b32f564 Merge neptunus.(none):/home/msvensson/mysql/bug10241 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-05-09 11:31:14 +02:00
msvensson@neptunus.(none)
ed39121c9a After review fixes 2005-05-09 11:30:20 +02:00
msvensson@neptunus.(none)
34cec09efb Merge neptunus.(none):/home/msvensson/mysql/bug10241 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-09 11:26:48 +02:00
msvensson@neptunus.(none)
670eef8756 Merge neptunus.(none):/home/msvensson/mysql/bug10241 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-05-09 11:23:12 +02:00
ramil@mysql.com
def8eb631c Merge mysql.com:/home/ram/work/mysql-4.1 
into mysql.com:/home/ram/work/mysql-5.0
 2005-05-06 20:11:01 +05:00
ramil@mysql.com
db3abccfa2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/ram/work/4.1
 2005-05-06 18:41:42 +05:00
rburnett@bk-internal.mysql.com
ad6de2c05a Merge bk-internal.mysql.com:/users/rburnett/bug9721 
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
 2005-05-06 15:15:48 +02:00
rburnett@bk-internal.mysql.com
c95e33fadf Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 
into bk-internal.mysql.com:/users/rburnett/bug9721
 2005-05-06 15:10:01 +02:00
ramil@ram-book.(none)
e1b6b7fe36 A fix (bug #7970: CONFIG_NR_CPUS not defined for kernel header percpu.h). 2005-05-06 16:12:42 +05:00
ramil@mysql.com
788678d392 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/ram/work/5.0
 2005-05-06 11:48:55 +05:00
bar@mysql.com
b93385de8f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/root/mysql-5.0
 2005-05-06 11:48:54 +05:00
ramil@mysql.com
802360fbc2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/ram/work/5.0
 2005-05-06 08:34:50 +05:00
shuichi@mysql.com
2244ae8cef Added cp932 character set 2005-05-05 11:37:52 -07:00
bar@noter.(none)
153b928c10 Bug#9509 Optimizer: wrong result after AND with latin1_german2_ci 
We cannot propagate constants with tricky collations.
 2005-05-05 21:13:57 +05:00
rburnett@bk-internal.mysql.com
e7d7c0f236 Bug #9721 net_write_timeout not used on Windows 
Added an extra parameter to all calls to timeout().  
1 means we want to set the write timeout
0 means we wnat to set the read timeout

viossl.c:
  Add which parameter to ssl timeout routine
vio_priv.h:
  Added which parameter to vio_ignore_timeout and vio_ssl_timeout
violite.h:
  Add which parameter to vio_timeout sigs
net_serv.cc:
  Use proper which code in call to vio_timeout to set the proper timeout
viosocket.c:
  Set the appropriate timeout in vio_timeout
 2005-05-05 17:17:57 +02:00