Commit graph

1353 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
31be565d2e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-01 20:24:30 +02:00
msvensson@neptunus.(none)
a5112188e2 Fix lowercase_fs_off problem on windows. This test should not be run if lower_case_filesystem=OFF.
By default lowercase_table_names are 1 on windows, and that makes the initialization of lower_case_filesystem variable to be skipped.
Add an else bracnh that does the initialization.
2006-07-31 12:47:56 +02:00
tsmith/tim@siva.hindu.god
24f96519de Finish the merge of the patch for bug #15195 from 4.1 -> 5.0
- Adapt it to work with the handlerton class
2006-07-20 13:41:00 -06:00
tsmith/tim@siva.hindu.god
17cc8acc91 Partial merge of the patch for bug #15195 from 4.1 -> 5.0; more changes needed 2006-07-20 00:45:47 -06:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b57efe738a --{skip-}merge option added which allows the user to disable merge engine and
to avoid the potential security problem.
(see bug #15195: Security Breach with MERGE table)
2006-07-14 16:26:58 +05:00
rburnett@bk-internal.mysql.com
3c6a8146be Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-06-26 16:56:28 +02:00
bar@mysql.com
ee8fd1e3b5 Bug#15276: MySQL ignores collation-server
Problem:
    mysqld --collation-server=xxx --character-set-server=yyy
    didn't work as expected: collation_server was set not to xxx,
    but to the default collation of character set "yyy".
    
    With different argument order it worked as expected:
    mysqld --character-set-server=yyy --collation-server=yyy 
    
    Fix:
    initializate default_collation_name to 0
    when processing --character-set-server
    only if --collation-server has not been specified
    in command line.
2006-06-23 18:00:49 +05:00
jani@ua141d10.elisa.omakaista.fi
f57cf654f4 Cleanup to patch for Bug#18246, "compilation error with tcp_wrapper" 2006-06-21 18:35:19 +03:00
jani@ua141d10.elisa.omakaista.fi
c22e7f2dfd Fix for Bug#18246 "compilation error with tcp_wrapper" 2006-06-21 02:23:18 +03:00
svoj@may.pils.ru
8d802218fb Merge april:devel/BitKeeper/mysql-5.0-engines
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
2006-06-19 16:11:23 +05:00
svoj@may.pils.ru
036f947be7 BUG#12982 - LOAD DATA fails without any error for big files with big
read buffer
Setting read buffer to values greater than SSIZE_MAX results in
unexpected behavior.

According to read(2) manual:
If count is greater than SSIZE_MAX, the result is unspecified.

Set upper limit for read_buffer_size and read_rnd_buffer_size to
SSIZE_MAX.
2006-06-07 19:44:43 +05:00
tnurnberg@mysql.com
4dc848752d Bug#18235: assertion/crash when windows mysqld is ended with ctrl-c
Two threads both try a shutdown sequence which creates a race to the
de-init/free of certain resources.

This exists in similar form in the client as 17926: "mysql.exe crashes
when ctrl-c is pressed in windows."
2006-05-31 14:27:31 +02:00
msvensson@neptunus.(none)
076ddbf840 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-29 15:06:37 +02:00
msvensson@neptunus.(none)
18bda1aff2 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-29 13:11:21 +02:00
elliot@mysql.com
47f7438333 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/emurphy/iggy/mysql-5.0
2006-05-26 15:00:09 -04:00
monty@mysql.com
7cb3df0114 Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-05-24 17:32:17 +03:00
monty@mysql.com
9e9ca8b6eb More DBUG statements
Replaced COND_refresh with COND_global_read_lock becasue of a bug in NTPL threads when using different mutexes as arguments to pthread_cond_wait()
The original code caused a hang in FLUSH TABLES WITH READ LOCK in some circumstances because pthread_cond_broadcast() was not delivered to other threads.
This fixes:
Bug#16986: Deadlock condition with MyISAM tables
Bug#20048: FLUSH TABLES WITH READ LOCK causes a deadlock
2006-05-24 17:21:35 +03:00
elliot@mysql.com
15f763af84 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0-bug19394
2006-05-24 09:02:55 -04:00
msvensson@neptunus.(none)
5e19424c00 Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-23 10:36:06 +02:00
msvensson@neptunus.(none)
0144b51445 Add comment for 'kill_server' function 2006-05-23 10:33:53 +02:00
jimw@mysql.com
2b13192c2e Merge mysql.com:/home/jimw/my/mysql-5.0-1039
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2006-05-19 16:17:24 -07:00
iggy@mysql.com
2cae56794c BUG#19322 Added help defintion for --skip-external locking to mysqld --help --verbose 2006-05-19 13:17:07 -04:00
msvensson@devsrv-b.mysql.com
49eeb1bb57 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0
2006-05-19 13:16:06 +02:00
msvensson@neptunus.(none)
f186a3f24e Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-19 13:09:15 +02:00
msvensson@neptunus.(none)
b9a59fa014 Bug#15869 Cannot shutdown the server - it restarts
- A segfault occured when the function 'kill_server' called 
   'my_sigset' with signal number 0. 'my_sigset' is a macro which
   uses 'sigaction' to install the signal handler with an invalid
   signal number will on most platforms return EINVAL but yields
   a segfauilt on IRIX 6.5
 - The server crash was detected by mysqld_safe and it was restarted although
   a shutdown was requested. 
 - Semantics of kill_server(0) is not known, leaving it intact
2006-05-19 13:07:24 +02:00
knielsen@mysql.com
b6ee2d2340 Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix
into  mysql.com:/usr/local/mysql/tmp-5.0
2006-05-15 19:57:12 +02:00
knielsen@mysql.com
fc16aff742 Fix two Valgrind memory leak warnings. 2006-05-15 18:07:18 +02:00
jimw@mysql.com
ebe38efaa6 Bug #1039: tmpdir and datadir not available via @@ system variable syntax
Bug #19606: ssl variables are not displayed in show variables
Bug #19616: log_queries_not_using_indexes  is not listed in show variables

  Make basedir, datadir, tmpdir, log_queries_not_using_indexes, ssl_ca,
  ssl_capath, ssl_cert, ssl_cipher, and ssl_key all available both from
  SHOW VARIABLES and as @@variables.

  As a side-effect of this change, log_queries_not_using_indexes can
  be changed at runtime (but only globally, not per-connection).
2006-05-08 16:38:45 -07:00
msvensson@neptunus.(none)
b60540a862 Remove valgrind and compiler warnings
Add function 'vio_end' that will cleanup resources allocated by vio and the components it uses.
2006-05-08 17:14:06 +02:00
elliot@mysql.com
f6aad253ab BUG#19394 OPT_INNODB_THREAD_CONCURRENCY duplicated
Removed duplication (not a user-visible change)
2006-04-28 16:13:19 -04:00
msvensson@neptunus.(none)
31db4898c3 Merge neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-26 22:24:25 +02:00
msvensson@neptunus.(none)
210af244b2 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug18564/my50-bug18564
2006-04-18 17:07:35 +02:00
svoj@april.(none)
8a7adb196d Merge april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1
into  april.(none):/home/svoj/devel/mysql/BUG17917/mysql-5.0
2006-04-15 16:08:03 +05:00
konstantin@mysql.com
6f51b4199f Merge mysql.com:/opt/local/work/mysql-5.0-root
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
2006-04-14 00:07:04 +04:00
konstantin@mysql.com
b915f054cf Fix a typo in the help message. 2006-04-13 14:06:46 +04:00
grog@mysql.com[grog]
3eb783813f foo2 2006-04-13 17:22:56 +09:30
grog@mysql.com[grog]
b2cd3a963a foo1 2006-04-13 17:20:33 +09:30
konstantin@mysql.com
75792fc0dc Merge mysql.com:/opt/local/work/mysql-4.1-16365
into  mysql.com:/opt/local/work/mysql-5.0-merge
2006-04-12 18:30:54 +04:00
msvensson@neptunus.(none)
9cdd78078e Bug#18564 Test failure due to test not checking preconditions
- Add variable "have_dynamic_loading" and use it to check if the udf test should be run.
2006-04-12 15:13:16 +02:00
msvensson@neptunus.(none)
e5712d8413 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208
2006-04-12 12:52:34 +02:00
aivanov@mysql.com
bb94bb30d0 Fixed BUG#15868: InnoDB hangs under 200 threads making INSERTs: 'thread thrashing'.
Applied changes due Heikki Tuuri.
2006-04-10 19:47:41 +04:00
konstantin@mysql.com
518993312c A fix and a test case for Bug#16365 "Prepared Statements: DoS with
too many open statements". The patch adds a new global variable
@@max_prepared_stmt_count. This variable limits the total number
of prepared statements in the server. The default value of
@@max_prepared_stmt_count is 16382. 16382 small statements
(a select against 3 tables with GROUP, ORDER and LIMIT) consume 
100MB of RAM. Once this limit has been reached, the server will 
refuse to prepare a new statement and return ER_UNKNOWN_ERROR 
(unfortunately, we can't add new errors to 4.1 without breaking 5.0). The limit is changeable after startup
and can accept any value from 0 to 1 million. In case
the new value of the limit is less than the current
statement count, no new statements can be added, while the old
still can be used. Additionally, the current count of prepared 
statements is now available through a global read-only variable 
@@prepared_stmt_count.
2006-04-07 23:37:06 +04:00
kroki@mysql.com
6222ca41a5 Bug#15933: max_used_connections is wrong after FLUSH STATUS if connections are cached
After FLUSH STATUS max_used_connections was reset to 0, and haven't
been updated while cached threads were reused, until the moment a new
thread was created.

The first suggested fix from original bug report was implemented:

  a) On flushing the status, set max_used_connections to
  threads_connected, not to 0.

  b) Check if it is necessary to increment max_used_connections when
  taking a thread from the cache as well as when creating new threads
2006-04-07 15:30:40 +04:00
acurtis@xiphis.org
63fb6609da Bug#14575
¨MySQL server crashes if you try to access to InnoDB table¨
  crash caused by schizophrenic mysqld - 2 memory locations for logically same function
  with conflicting values.
  Fixed by backporting from 5.1 changes to have_xyz_db declarations.
2006-03-16 00:15:23 -08:00
paul@kite-hub.kitebird.com
dd0635dc38 mysqld.cc:
Backport option description change from 5.1 to 5.0.
2006-03-14 13:26:28 -06:00
msvensson@neptunus.(none)
aa3abd1550 Cleanup SSL implementation
Remove duplicate code
Merge common functions
Enforce MySQL coding standard
2006-03-10 16:41:14 +01:00
aelkin@mysql.com
d187d410d1 BUG#15101 SYSDATE() disregards SET TIMESTAMP.
After the ChangeSet 1.1892.20.1 2005/08/24 (Bug #12562) SYSDATE() is not an alias
   of NOW() and is unsafe for replication.
   `SYSDATE()' backward compatible aliasing clashes with the idea #12562 
   fix. To make it safe-replicatable we have to either use RBR or to restore
   the pre-5.0 style.
   --sysdate-is-now command line flag was introduced to provide backward compatibility.
2006-03-10 16:47:56 +02:00
brian@zim.(none)
eefd1207bb This patch does 1) fix my build breakage 2) Complete the removal of all symbols which could clash with another parser. 2006-03-09 16:44:08 -08:00
monty@mysql.com
82b77cdd90 Fixes to embedded server to be able to run tests with it
(Needed for "list of pushes" web page and autopush)
2006-02-24 18:34:15 +02:00
paul@snake-hub.snake.net
b2529c2ab2 mysqld.cc:
Fix out of order entries in option struct.
2006-02-23 09:11:05 -06:00