1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-21 11:01:08 +03:00
Commit Graph

2727 Commits

Author SHA1 Message Date
unknown
f97fd0f0b7 Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.1-4100


myisam/mi_create.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-03-04 09:35:21 +01:00
unknown
4e09f68e87 typos fixed 2005-03-03 23:10:23 +01:00
unknown
9210c01cac merge
include/my_global.h:
  Auto merged
mysys/mf_tempfile.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/table.cc:
  Auto merged
2005-03-03 23:07:20 +01:00
unknown
8104faa083 Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)
include/my_global.h:
  O_NOFOLLOW
isam/create.c:
  create table files with O_EXCL|O_NOFOLLOW
merge/mrg_create.c:
  create table files with O_EXCL|O_NOFOLLOW
myisam/mi_create.c:
  create files of temporary tables with O_EXCL|O_NOFOLLOW
myisammrg/myrg_create.c:
  create table files with O_EXCL|O_NOFOLLOW
mysys/mf_tempfile.c:
  create temporary files with O_EXCL|O_NOFOLLOW
sql/ha_myisam.cc:
  let mi_create know if the table is TEMPORARY
sql/mysql_priv.h:
  --allow_suspicious_udfs
sql/mysqld.cc:
  --allow_suspicious_udfs
sql/share/english/errmsg.txt:
  typo
sql/sql_udf.cc:
  --allow_suspicious_udfs
  don't allow xxx() udf without any of xxx_init/deinit/add/reset
  check paths when loading from mysql.func
sql/table.cc:
  create frm of temporary table with O_EXCL|O_NOFOLLOW
2005-03-03 19:51:29 +01:00
unknown
91820633ac Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean


sql/mysqld.cc:
  Auto merged
2005-03-02 11:38:38 +01:00
unknown
d7e0784c65 Fix for BUG#8325 "Deadlock in replication thread stops replication":
in slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded,
optionally retry the transaction a certain number of times (new variable --slave_transaction_retries).


sql/mysql_priv.h:
  new var slave_transaction_retries
sql/mysqld.cc:
  new variable slave_transaction_retries. Plus fixing a typo.
sql/set_var.cc:
  new global variable slave_transaction_retries (will be one per subslave, when we have multimaster).
sql/slave.cc:
  Slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded,
  optionally retry the transaction a certain number of times (--slave_transaction_retries).
sql/slave.h:
  new RELAY_LOG_INFO::trans_retries.
2005-03-02 11:29:48 +01:00
unknown
1a3ee0dec5 Fixed Bug#7906, "Cmdline help for mysqld --ansi option misses some info". 2005-03-01 14:13:25 +02:00
unknown
8b8c9452dd Fixed wrong memory references found by purify
(No really critical errors found, but a few possible wrong results)


innobase/dict/dict0dict.c:
  Replace memcmp with comparison of characters to avoid warnings from purify when 'sptr' points to a very short string
mysql-test/r/select_found.result:
  Add missing drop table
mysql-test/r/type_set.result:
  More tests
mysql-test/t/select_found.test:
  Add missing drop table
mysql-test/t/type_set.test:
  More tests
mysys/my_init.c:
  Avoid warning from purify (purify doesn't handle getrusage() properly)
sql/field.h:
  enum & set are sorted as numbers. This fixes an access to uninitialized memory when enum/set are multi-byte characters
sql/filesort.cc:
  enum & set are sorted as numbers. This fixes an access to uninitialized memory when enum/set are multi-byte characters
sql/item_cmpfunc.cc:
  Fixed warning from purify. (Not critical as the arguments are passed to a function but not used)
  Allocate Arg_comparator() with 'new' instead of sql_alloc() to ensure proper initialization
sql/mysqld.cc:
  Wait for signal handler to stop when running --bootstrap
  (Fixes warning from purify)
sql/sql_insert.cc:
  Initialize slot used by innodb.cc (not critical)
sql/sql_lex.h:
  Better comments
sql/sql_repl.cc:
  memcmp -> bcmp() to avoid warning from purify
sql/sql_select.cc:
  Fix for out-of-bound memory reference when doing DISTINCT on const expressions
strings/ctype-simple.c:
  Fixes to not access uninitialized memory
  (Not critical)
2005-02-28 11:59:46 +02:00
unknown
62ff22ee28 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-02-22 13:14:49 -08:00
unknown
6f6bf32afa Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-02-22 13:22:34 +01:00
unknown
7d766fdbeb BUG#6662: Changes after Guilhems and Sergs review 2005-02-22 12:40:31 +01:00
unknown
edaf33a14e BUG#6662: Importing mysqldumps should not show any warnings of level "notes". 2005-02-21 18:40:28 +01:00
unknown
f1cea652d6 Fix merge of fix for Bug #4872.
sql/mysqld.cc:
  Clean up merge
2005-02-18 15:02:54 -08:00
unknown
d76b88b65c Fix for the bug #7344 (multiple server_init/server_end lead to crash)
Some variable wasn't moved to the initial state during mysql_server_end


myisam/ft_stopwords.c:
  resetting ft_stopword_file
sql/mysqld.cc:
  free_charsets() call added
2005-02-18 15:51:55 +04:00
unknown
5edc77beb8 When calling initgroups(), set a flag that the segfault handler checks
in order to output a special warning about a particular case of segfaults
due to a mix of static binaries, NSS, and LDAP. (Bug #4872)


sql/mysqld.cc:
  Add code to output a special message when we get a segfault when calling
  initgroups() to explain the problem.
2005-02-16 11:58:35 -08:00
unknown
ffe417fdde Applied a patch for Netware. 2005-02-08 19:49:40 +02:00
unknown
ceaacb741a mysqld.cc - remove extra #endif
sql/mysqld.cc:
  remove extra #endif
2005-02-07 12:06:55 +01:00
unknown
c83412f705 configure.in
don't define UNIV_DEBUG in CFLAGS/CXXFLAGS anymore
sql/mysqld.cc
    hide from the user options that do nothing
sql/sql_update.cc
    better fix for uninitialized used_index


configure.in:
  don't define UNIV_DEBUG in CFLAGS/CXXFLAGS anymore
sql/mysqld.cc:
  hide from the user options that do nothing
sql/sql_update.cc:
  better fix for uninitialized used_index
2005-02-02 12:08:20 +01:00
unknown
555c0e8fd1 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1


sql/mysqld.cc:
  Auto merged
2005-01-27 21:33:15 +02:00
unknown
edda6bb02c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1


include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-01-26 17:09:38 +04:00
unknown
d61e212f9e Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-01-25 22:12:22 +02:00
unknown
7ff1db2d62 sql_class.h, set_var.cc, mysqld.cc:
Add settable variables for semi-sync replication


sql/mysqld.cc:
  Add settable variables for semi-sync replication
sql/set_var.cc:
  Add settable variables for semi-sync replication
sql/sql_class.h:
  Add settable variables for semi-sync replication
2005-01-25 22:11:21 +02:00
unknown
c2a2f5afb8 Cleanups during review
BitKeeper/etc/ignore:
  added libmysqld/examples/mysqltest_embedded
client/mysqlbinlog.cc:
  Call mysql_close() before die()
innobase/include/eval0eval.ic:
  Remove assert that fails on 64 bit machines
  (Tested with BUILD/compile-pentium64-valgrind-max on 64 bit Intel CPU)
sql/mysqld.cc:
  Force lower_case_table_names to 0 if set to 2 on case insensitive file name
sql/sql_select.cc:
  Remove #if 0
2005-01-25 21:27:51 +02:00
unknown
f35117ea34 InnoDB: Backport innodb_autoextend_increment from 4.1
innobase/include/srv0srv.h:
  Add configuration variable srv_auto_extend_increment
innobase/srv/srv0srv.c:
  Add configuration variable srv_auto_extend_increment
sql/ha_innodb.h:
  Add configuration variable srv_auto_extend_increment
sql/mysqld.cc:
  Add startup option innodb_autoextend_increment
sql/set_var.cc:
  Add settable global variable innodb_autoextend_increment
2005-01-25 16:27:13 +02:00
unknown
844fe1ea6d Merge mysql.com:/home/jimw/my/mysql-4.1-7887
into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/mysqld.cc:
  Auto merged
2005-01-24 12:47:19 -08:00
unknown
15f37ac2b4 Set lower_case_file_system when it is being tested to check if
lower_case_tables_names=2 is sensible. Related to Bug #7887.


sql/mysqld.cc:
  Set lower_case_file_system when it is being tested to check
  if lower_case_tables_names=2 is sensible.
2005-01-24 12:31:14 -08:00
unknown
e33114ae2e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-01-24 13:47:52 +04:00
unknown
56b1a85469 A fix (Bug #8015: server refuses to start with long basedir path). 2005-01-21 17:51:24 +04:00
unknown
faff1cda2b Warn when mysqld starts up with lower_case_table_names=2 but datadir is
on a case-sensitive filesystem. (Bug #7887)


sql/mysqld.cc:
  Add warning when running with lower_case_table_names=2 and datadir is
  on a case-sensitive filesystem.
2005-01-19 12:23:24 -08:00
unknown
8e1e1e73d8 Final patch for BUG#4285.
This patch collects all previous patches into one.

The main problem was due to that there is are two variables -
dflt_key_cache and sql_key_cache with have more or less duplicate
function. The reson for the bug was that the default value in the key
cache hash was set to dflt_key_cache, then sql_key_cache was set to a
new key cache object, and then dflt_key_cache was set to sql_key_cache
which was different from the dflt_key_cache_var. After sending SIGHUP,
the server was using the original default value for the key cache hash,
which was different from the actual key cache object used for the
default key cache.


include/keycache.h:
  Import patch 4285.diff
mysys/mf_keycache.c:
  Import patch 4285.diff
sql/mysql_priv.h:
  Import patch 4285.diff
sql/mysqld.cc:
  Import patch 4285.diff
sql/set_var.cc:
  Import patch 4285.diff
sql/sql_parse.cc:
  Import patch 4285.diff
sql/sql_show.cc:
  Import patch 4285.diff
2005-01-19 12:55:54 +02:00
unknown
85812350cd Merge build.mysql.com:/users/tulin/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.1


sql/mysqld.cc:
  Auto merged
2005-01-19 07:21:44 +01:00
unknown
982e0b8cfb changed "formatting" after sergs comments on prev chanset 2005-01-19 04:43:54 +01:00
unknown
a1afeb26b6 Merge build.mysql.com:/users/tulin/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.1


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-01-19 03:37:51 +01:00
unknown
a66d80d17e removed default usage of shared memory transporter as it is not verified on enough platforms 2005-01-18 22:09:15 +01:00
unknown
01857eaf33 Since the #ifdef check is too late in the code,
it was not possible to compile without InnoDB.
2005-01-18 18:55:34 +01:00
unknown
2524517978 Allow "classic" builds (= without InnoDB) by eliminating an "unresolved reference" (bug#7961).
sql/mysqld.cc:
  To allow builds without InnoDB ("classic"), the reference to 'innobase_use_checksums' must be guarded by an appropriate '#ifdef' (bug#7961).
2005-01-17 18:08:07 +01:00
unknown
f33566b55f When we warn that --log-bin alone is dangerous, we give a suggestion.
sql/mysqld.cc:
  more suggestive warning message
sql/sql_class.h:
  need a method to see MYSQL_LOG::name (the name of the binlog but without the numeric extension)
2005-01-16 15:46:28 +01:00
unknown
b4313f0f34 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean


sql/mysqld.cc:
  Auto merged
2005-01-13 21:36:28 +01:00
unknown
d4e14b2f1d Applied a patch for Netware. 2005-01-13 19:46:46 +02:00
unknown
6c21060005 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean


sql/mysqld.cc:
  Auto merged
2005-01-13 15:59:48 +01:00
unknown
c73762dbdf user_limits.result:
Fix test result affected by error message rewording.
errmsg.txt:
  Reword error messages.
set_var.cc:
  Reorder variables.
mysqld.cc:
  Reorder options.


sql/mysqld.cc:
  Reorder options.
sql/set_var.cc:
  Reorder variables.
sql/share/errmsg.txt:
  Reword error messages.
mysql-test/r/user_limits.result:
  Fix test result affected by error message rewording.
2005-01-12 20:38:05 -06:00
unknown
0cb34bec73 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean


sql/mysqld.cc:
  Auto merged
2005-01-12 22:25:12 +01:00
unknown
901321b893 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0


sql/mysqld.cc:
  Auto merged
2005-01-12 14:53:11 -06:00
unknown
8f61caea0a logging_ok:
Logging to logging@openlogging.org accepted
innodb.result, innodb.test, set_var.cc, mysqld.cc:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets


sql/mysqld.cc:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
sql/set_var.cc:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
mysql-test/t/innodb.test:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
mysql-test/r/innodb.result:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-12 20:55:06 +01:00
unknown
7310387078 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0


sql/mysqld.cc:
  Auto merged
2005-01-12 12:35:34 +01:00
unknown
0bcfc49b4b added missing Com_update_multi status variable 2005-01-12 12:18:17 +01:00
unknown
397f3ee554 Encourage user to specify a name for the binlog index file (either by giving an argument to --log-bin,
or by using --log-bin-index). This is so that he does not have a replication break when his master's
hostname changes. Plus binary logging options consistency checks.


sql/mysqld.cc:
  * Encourage user to specify a name for the binlog index file (either by giving an argument to --log-bin,
  or by using --log-bin-index). This is so that he does not have a replication break when his master's
  hostname changes. Why not a fatal error? To not break existing many-machine setups.
  * --log-bin-index without --log-bin does not make sense.
  * --log-slave-updates without --log-bin does not either.
support-files/my-huge.cnf.sh:
  encourage providing an argument to log-bin
support-files/my-innodb-heavy-4G.cnf.sh:
  encourage providing an argument to log-bin
support-files/my-large.cnf.sh:
  encourage providing an argument to log-bin
support-files/my-medium.cnf.sh:
  encourage providing an argument to log-bin
support-files/my-small.cnf.sh:
  encourage providing an argument to log-bin
2005-01-11 00:16:07 +01:00
unknown
9755b5e5f3 mysqld.cc:
Fix out-of-order option.


sql/mysqld.cc:
  Fix out-of-order option.
2005-01-08 22:34:54 -06:00
unknown
6f45da15f3 Merge bk-internal:/home/bk/mysql-5.0
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0


innobase/srv/srv0srv.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-01-08 15:06:20 +01:00
unknown
8a8823d27f Many files:
- Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable


innobase/include/srv0srv.h:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
innobase/srv/srv0srv.c:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
mysql-test/r/innodb.result:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
mysql-test/t/innodb.test:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
sql/ha_innodb.cc:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
sql/ha_innodb.h:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
sql/mysqld.cc:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
sql/set_var.cc:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
2005-01-08 15:01:37 +01:00