mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37605 commits 2784 branches 343 tags 1.6 GiB
Commit graph

37605 commits

This branch
This branch
All branches
Author SHA1 Message Date
kaa@polly.(none)
b794e5f212 Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731_buffer_limits 
into  polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
 2007-10-02 12:41:08 +04:00
kaa@polly.(none)
d8d3698b4a Merge polly.(none):/home/kaa/src/maint/bug5731.old/my50-bug5731-read_buffer_size 
into  polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
 2007-10-02 11:18:00 +04:00
kaa@polly.(none)
cfb88e652d Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731_keycache 
into  polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
 2007-10-02 11:14:19 +04:00
kaa@polly.(none)
8da409ac16 This patch is a part of work on bug #5731 "key_buffer_size not properly restricted to 4GB". 
The patch limits read_buffer_size and read_rnd_buffer_size by 2 GB on all platforms for the following reasons:
  
- I/O code in mysys, code in mf_iocache.c and in some storage engines do not currently work with sizes > 2 GB for those buffers
- even if the above had been fixed, Windows POSIX read() and write() calls are not 2GB-safe, so setting those buffer to sizes > 2GB would not work correctly on 64-bit Windows.
 2007-09-07 11:58:04 +04:00
kaa@polly.local
ab0373e78a Backport of the keycache changes from http://lists.mysql.com/commits/31517 to make keycache 64-bit safe in 5.0. This is for bug #5731. 2007-08-29 20:45:04 +04:00
kaa@polly.local
f02a1f2c91 Limit join_buffer_size, sort_buffer_size and myisam_sort_buffer_size to 4GB on all platforms, since the related code in 5.0 is not 64-bit safe. This is patch is a part of work on bug #5731 and will be null-merged to 5.1. 2007-08-29 20:33:44 +04:00
kaa@polly.local
39e53b4fee Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms. 
This is required to allow key_buffer_size > 4 GB (bug #5731).
 2007-08-29 19:20:18 +04:00
tsmith@ramayana.hindu.god
044cd7b471 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/b27694/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-28 13:24:31 -06:00
msvensson@pilot.(none)
bce8ea54ff Merge pilot.(none):/data/msvensson/mysql/bug28812/my50-bug28812 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-28 11:35:22 +02:00
msvensson@pilot.(none)
c2b817013c Merge pilot.(none):/data/msvensson/mysql/yassl_import/my50-yassl_import 
into  pilot.(none):/data/msvensson/mysql/bug28812/my50-bug28812
 2007-08-28 11:35:05 +02:00
msvensson@pilot.(none)
ec421a02a9 Bug#28812 rpl_ssl fails due to assert in extra/yassl/src/socket_wrapper.cpp:117 
- Merge sslaccept and sslconnect.
 - Atomically "reset" vio to VIO_TYPE_SSL when the SSL connection has
   succeeded, this avoids having to revert anything and thus protects
   against "close_active_vio" in the middle.
 - Add some variance to the testcase
 2007-08-28 11:34:43 +02:00
msvensson@pilot.(none)
394d9a0e55 Import yaSSL version 1.7.2 
- Fix bug#27265
- Support for fixing bug#18441
 2007-08-28 10:35:55 +02:00
tsmith@ramayana.hindu.god
86ef148e6c Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-27 18:19:55 -06:00
df@pippilotta.erinye.com
0670af9479 adjust version number 2007-08-27 11:38:32 +02:00
msvensson@pilot.(none)
f9c245611e Bug#29805 mysql_upgrade test fail if ~/.my.cnf contain a password 
- "mysql" and "mysqlcheck" should not read defaults file
 2007-08-27 11:31:49 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
ba419bdc8c Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
 2007-08-27 11:24:54 +02:00
msvensson@pilot.(none)
a91bd85215 Bug#28560 mysql_upgrade test links /usr/local/mysql/lib libraries 
- Chop off .libs/ part of path if running in non installed builddir
   using libtool
 2007-08-27 10:25:34 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
516cafdc79 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel
 2007-08-25 11:39:56 +03:00
joerg@trift2.
d7c1a81136 Merge trift2.:/MySQL/M50/netware2-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-24 23:40:36 +02:00
joerg@trift2.
2fd45aaee6 Fixes for the NetWare builds, discovered during 5.1.21-beta and backported to 5.0: 
1) Ensure "init_db.sql" and "test_db-sql" really get built.

2) Ensure the "*.def" files with NetWare linker options get distributed to the proper directories.
 2007-08-24 23:07:59 +02:00
msvensson@pilot.(none)
89780a84c8 Remove unsued variable $glob_hostname, unused functions 
'mtr_short_hostname' and 'mtr_full_hostname'
 2007-08-24 15:43:45 +02:00
dfischer/mysqldev@production.mysql.com
81528c1a00 Merge bk-internal:/home/bk/mysql-5.0-build 
into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
 2007-08-24 13:47:11 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
b356018839 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel
 2007-08-24 14:43:33 +03:00
dfischer/mysqldev@mysql.com/production.mysql.com
74afbb4b7b Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
 2007-08-24 13:30:16 +02:00
msvensson@pilot.(none)
643ce3979f Merge pilot.(none):/data/msvensson/mysql/bug30593/my50-bug30593 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-24 13:11:14 +02:00
msvensson@pilot.(none)
4fcea0fc5c Remove unecessary use of "Socket" 2007-08-24 13:10:34 +02:00
joerg@trift2.
e8aa23fae4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-24 12:34:45 +02:00
joerg@trift2.
76a05d26d5 Merge trift2.:/MySQL/pushed/netware-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-24 10:58:14 +02:00
joerg@trift2.
aa588114a2 NetWare packages were missing the scripts to initialize the database: add them. 2007-08-24 10:47:13 +02:00
df@pippilotta.erinye.com
30435b43f2 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-08-24 09:55:47 +02:00
gshchepa@bk-internal.mysql.com
c70dbeab8b Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/users/gshchepa/mysql-5.0-opt
 2007-08-23 21:28:33 +02:00
msvensson@pilot.(none)
e1b9e55a5a Bug#30593 No cipher list returned for "SHOW STATUS LIKE 'Ssl_cipher_list'" 
- Move increment of "i" to "increment section" of for loop
 - Protect against writing after end of "buff"(backport from 5.1)
 2007-08-23 20:24:48 +02:00
joerg@trift2.
53114c7073 Merge trift2.:/MySQL/M50/netware-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-23 19:47:42 +02:00
df@pippilotta.erinye.com
07c6ef515d Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-marvel 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.48
 2007-08-23 17:43:47 +02:00
df@pippilotta.erinye.com
08a53d0d5f Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-opt 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.48
 2007-08-23 17:43:15 +02:00
joerg@trift2.
18b8e7a33f Cleanup in the "netware" subdirectory: 
1) We do not provide the "isam" table handler in 5.0 and up (different from "myisam" !),
   so we do not need the ".def" files for the "isam"-specific tools.

2) Use "basename" to get the base name of a file, not a harder-to-read sed expression.
 2007-08-22 22:04:31 +02:00
gshchepa/uchum@gleb.loc
16e0a4de56 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30201 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-22 22:23:03 +05:00
jani@hynda.mysql.fi
28b2b89013 Merge hynda.mysql.fi:/home/my/mysql-5.0-main 
into  hynda.mysql.fi:/home/my/mysql-5.0-marvel
 2007-08-22 16:19:06 +03:00
gshchepa/uchum@gleb.loc
f3d0f62d10 Fixed bug #30201. 
Killing a SELECT query with KILL QUERY or KILL CONNECTION
causes a server crash if the query cache is enabled.

Normal evaluation of a query may be interrupted by the
KILL QUERY/CONNECTION statement, in this case the mysql_execute_command
function returns TRUE, and the thd->killed flag has true value.
In this case the result of the query may
be cached incompletely (omitting call to query_cache_insert inside
the net_real_write function), and next call to query_cache_end_of_result
may lead to server crash.
Thus, the query_cache_end_of_result function has been modified to abort
query cache in the case of killed thread.
 2007-08-22 18:15:54 +05:00
joerg@trift2.
cd1561d5a8 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-21 18:24:01 +02:00
jani@hynda.mysql.fi
bca8c4d353 Merge hynda.mysql.fi:/home/my/mysql-5.0-main 
into  hynda.mysql.fi:/home/my/mysql-5.0-marvel
 2007-08-21 19:06:47 +03:00
gshchepa/uchum@gleb.loc
86768df764 Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-21 20:56:40 +05:00
thek@adventure.(none)
88107378cd Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
 2007-08-21 17:47:06 +02:00
gshchepa/uchum@gleb.loc
c652d3df95 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30287 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-21 19:30:32 +05:00
gluh@mysql.com/eagle.(none)
4446fd4b0d compiler warning fix 2007-08-21 18:59:42 +05:00
gluh@eagle.(none)
9bae69b299 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-08-21 17:57:48 +05:00
thek@adventure.(none)
acfe3fc924 Bug#30269 Query cache eats memory 
Although the query cache doesn't support retrieval of statements containing
column level access control, it was still possible to cache such statements
thus wasting memory.
  
This patch extends the access control check on the target tables to avoid
caching a statement with column level restrictions. 

Views are excepted and can be cached but only retrieved by super user account.
 2007-08-21 13:43:09 +02:00
gshchepa/uchum@gleb.loc
4c144f6349 Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-21 16:31:30 +05:00
gshchepa/uchum@gleb.loc
d1b4cee88f Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-21 16:14:46 +05:00
gshchepa/uchum@gleb.loc
5d3809c264 Fixed bug #30287. 
The server created temporary tables for filesort in the working directory
instead of the specified tmpdir directory.
 2007-08-21 01:39:39 +05:00