1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Commit Graph

18792 Commits

Author SHA1 Message Date
5434defee5 Collection of changes per Bar and Serg.
acinclude.m4:
  Change in message
mysql-test/r/blackhole.result:
  Lowered the number of inserts.
mysql-test/t/blackhole.test:
  Lowered the number of inserts.
sql/ha_blackhole.cc:
  Added indexes per Serg, correction of indention, added asserts per Serg.
sql/ha_blackhole.h:
  Indention fix, added methods for index...
2005-03-24 16:07:56 -08:00
cdf8e293d9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-24 20:17:08 +01:00
ed124ab6b7 myisamchk.c:
Wrong help string fix.


myisam/myisamchk.c:
  Wrong help string fix.
2005-03-24 18:21:56 +04:00
73c6430a01 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2005-03-24 18:11:35 +04:00
9b2e4c7c60 Fixed that LEFT OUTER JOIN was replaced with a regulat join
in some cases, because "charset(x) = 'string'" was considered
as "x is not null" due to incorrect not_null_tables().
2005-03-24 18:10:46 +04:00
fe5793342c Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug9303
2005-03-24 14:26:39 +01:00
e7db877956 BUG#9303 blob field with specified length < 256 does not create tinyblob
mysql-test/r/type_blob.result:
  Test creates a blob(250 whcih is now displayed as tinyblob when SHOW COLUMNS is called.
sql/sql_parse.cc:
  Added missing else so that FIELD_TINY_BLOB can be selected
2005-03-24 13:48:38 +01:00
8287938b79 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


sql/mysqld.cc:
  Auto merged
2005-03-24 12:21:55 +01:00
b18f2c2a89 mysql-test/r/ps_6bdb.result
followup - results fixed


mysql-test/r/ps_6bdb.result:
  followup - results fixed
2005-03-24 10:28:02 +01:00
c26930d26f Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-23 21:10:01 +01:00
d4285cae16 upgrade zlib to 1.2.2
acinclude.m4:
  clarify help text
2005-03-23 21:08:13 +01:00
58aeecb078 client/mysqltest.c
corrected number of fields for --enable_metadata
sql/sql_union.cc
    fixed a apparent typo in assert


client/mysqltest.c:
  corrected number of fields for --enable_metadata
mysql-test/r/metadata.result:
  corrected number of fields for --enable_metadata
mysql-test/r/ps_1general.result:
  corrected number of fields for --enable_metadata
mysql-test/r/ps_2myisam.result:
  corrected number of fields for --enable_metadata
mysql-test/r/ps_3innodb.result:
  corrected number of fields for --enable_metadata
mysql-test/r/ps_4heap.result:
  corrected number of fields for --enable_metadata
mysql-test/r/ps_5merge.result:
  corrected number of fields for --enable_metadata
mysql-test/r/type_enum.result:
  corrected number of fields for --enable_metadata
sql/sql_union.cc:
  fixed a apparent typo in assert
2005-03-23 20:38:42 +01:00
2621e38bf9 Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
2005-03-23 19:50:42 +01:00
6bc324ed21 "After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication":
s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
no message on error log (deadlock is too common sometimes), a global counter
instead (SHOW STATUS LIKE 'slave_retried_transactions').
Plus a fix for libmysql/Makefile.shared


libmysql/Makefile.shared:
  When we "make clean" in libmysql/ we remove the symlinks there, so we
  need to mark that they have to be recreated later: this is done by removing
  ../linked_libmysql_sources. If we don't do this, 'make' will fail after 'cd libmysql;make clean'.
  This Makefile.shared is used by libmysql_r too.
  No reason to remove linked_client_sources as we don't remove the links in client/.
mysql-test/r/rpl_deadlock.result:
  result fix
mysql-test/t/rpl_deadlock.test:
  small test addition
sql/mysqld.cc:
  if active_mi could not be alloced, die. New SHOW STATUS LIKE "slave_retried_transactions".
sql/slave.cc:
  If slave retries automatically a transaction, no message on error log
  (too common situation); sleep 0 secs at first retry, then 1, 2, 3, 4,
  5, 5, 5... Sleeping 0 is to get the least possible late, as deadlocks
  are usually resolved at first try. New global counter rli->retried_trans
  (for SHOW STATUS: total number of times the slave had to retry
  any transaction). safe_sleep() is thread-safe, sleep() was not.
  I change the rli->trans_retries counter to go from 0 to max instead
  of the other way (better for new sleep()).
sql/slave.h:
  new global counter rli->retried_trans
sql/sql_show.cc:
  SHOW STATUS LIKE "slave_retried_transactions"; needs replication mutexes.
  Can't be a simple SHOW_LONG, because active_mi is unset (not alloced yet)
  when the static global status_vars is created (active_mi is set
  in init_slave()).
sql/structs.h:
  new SHOW_SLAVE_RETRIED_TRANS
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-23 19:19:36 +01:00
d2ab1393ff README:
Fix typo.


mysql-test/README:
  Fix typo.
2005-03-23 10:45:57 -06:00
3315fab91e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-23 09:41:01 +01:00
e49474330b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-23 07:58:25 +01:00
5a42525027 fixed union types merging and table related metadata (BUG#8824)
mysql-test/r/func_group.result:
  new result
mysql-test/r/metadata.result:
  new result
  test of metadata of variables, unions and derived tables
mysql-test/r/union.result:
  new results
  test of union of enum
mysql-test/t/metadata.test:
  test of metadata of variables, unions and derived tables
mysql-test/t/union.test:
  test of union of enum
sql/field.cc:
  Field type merging rules added
  Fixed table name/alias returting for field made from temporary tables
sql/field.h:
  removed unned field type reporting
sql/item.cc:
  fixed bug in NEW_DATE type field creartion
  replaced mechanism of merging types of UNION
sql/item.h:
  replaced mechanism of merging types of UNION
sql/item_func.h:
  new item type to make correct field type detection possible
sql/item_subselect.cc:
  added table name parameter to prepare() to show right table alias for derived tables
sql/sql_derived.cc:
  added table name parameter to prepare() to show right table alias for derived tables
sql/sql_lex.h:
  added table name parameter to prepare() to show right table alias for derived tables
sql/sql_parse.cc:
  made function for enum/set pack length calculation
sql/sql_prepare.cc:
  added table name parameter to prepare() to show right table alias for derived tables
sql/sql_select.cc:
  new temporary table field creation by Item_type_holder
  fixed table alias for temporary table
sql/sql_union.cc:
  added table name parameter to prepare() to show right table alias for derived tables
2005-03-23 08:36:48 +02:00
8a99997d60 Additional storage engine called "blackhole". Customer request, and for that matter a Zawodny request. With this you can alter table to a type of table that would never store data. Its a /dev/null for a database.
acinclude.m4:
  New macro rule for ha_blackhole.
configure.in:
  Rule enabling blackhole engine
sql/Makefile.am:
  Additions to Makefile for blackhole engine
sql/handler.cc:
  Ifdef enable code for blackhole (and message for "what does this thing do").
sql/handler.h:
  Flag for storage engine type.
sql/mysql_priv.h:
  Added blackhole type.
sql/mysqld.cc:
  Updates for building backhole.
sql/set_var.cc:
  Show variable for blackhole engine
2005-03-22 16:10:39 -08:00
18e7d8f6d7 Fix calls to memset() with arguments out of order. (Bug #9323)
bdb/hash/hash_open.c:
  Fix order of arguments to memset()
bdb/btree/bt_open.c:
  Fix order of arguments to memset()
ndb/src/kernel/vm/VMSignal.cpp:
  Fix order of arguments to memset()
2005-03-22 16:00:02 -08:00
1c0c25e747 Simplified rounding up to nearest 64-bit boundry 2005-03-22 22:12:24 +01:00
677a9936a1 Added better comment for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index 2005-03-22 17:48:28 +01:00
8d0393aae3 Extra fix for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index 2005-03-22 17:42:08 +01:00
ce488b51e6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-22 16:16:10 +01:00
3a88de4321 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl


mysql-test/mysql-test-run.sh:
  Auto merged
2005-03-22 15:57:20 +01:00
27a711b4cb mysql-test-run.sh, mysql-test-run.pl:
InnoDB needs longer start time for second slave on slow hosts


mysql-test/mysql-test-run.pl:
  InnoDB needs longer start time for second slave on slow hosts
mysql-test/mysql-test-run.sh:
  InnoDB needs longer start time for second slave on slow hosts
2005-03-22 15:12:05 +01:00
5e598cced3 Merge neptunus.(none):/home/msvensson/mysql/bug9072
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-22 14:29:34 +01:00
bac0698065 Fixed newly introduced bug in ROLLUP 2005-03-22 02:36:31 +02:00
6d0d2c7e1d trx0trx.c:
If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)


innobase/trx/trx0trx.c:
  If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
2005-03-21 22:21:55 +02:00
421907e932 Merge
BitKeeper/etc/logging_ok:
  auto-union
innobase/include/trx0trx.h:
  Auto merged
innobase/trx/trx0trx.c:
  SCCS merged
2005-03-21 22:14:00 +02:00
7656b6da71 trx0trx.c, trx0trx.h:
If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)


innobase/include/trx0trx.h:
  If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
innobase/trx/trx0trx.c:
  If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
2005-03-21 22:10:42 +02:00
9f47e08e03 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-03-21 17:46:20 +01:00
4da513f5e7 A fix for Netware. 2005-03-21 18:11:11 +02:00
a94a62cefb mtr_report.pl:
Made --timer work
mtr_cases.pl:
  Added option --reorder to get less server restarts
mysql-test-run.pl:
  Added option --reorder to get less server restarts
  Moved do_before_start_master() not to remove binlog files unless restarted
  Made --timer work
  Slave was incorrectly writing log to error log


mysql-test/mysql-test-run.pl:
  Added option --reorder to get less server restarts
  Moved do_before_start_master() not to remove binlog files unless restarted
  Made --timer work
  Slave was incorrectly writing log to error log
mysql-test/lib/mtr_cases.pl:
  Added option --reorder to get less server restarts
mysql-test/lib/mtr_report.pl:
  Made --timer work
2005-03-21 16:01:39 +01:00
11e01bfa2d BUG#9072 'Max_error_count' system variable cannot be set to zero
- Chaned min value in mysqld.cc
 - Added testcase to warnings.test


mysql-test/r/warnings.result:
  Added testcase for testing max and min value of max_error_count
mysql-test/t/warnings.test:
  Added testcase for testing max and min value of max_error_count
sql/mysqld.cc:
  Change min value of max_error_count from 1 to 0
2005-03-21 11:07:31 +01:00
5827a23bc7 ndb -
Fix uninit variable (potential segv) in Dbacc::sendNextScanConf
  discovered by magnus addition in "globals_list"


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Fix uninit variable (potential segv) in sendNextScanConf
    discovered by magnus addition in "globals_list"
2005-03-20 20:07:12 +01:00
4b454c6eed Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-03-18 17:14:17 +01:00
8d29891138 Move mis-placed assignments to their proper position. 2005-03-18 12:44:40 +01:00
c4ab5d61fb don't allow to commit as mysqldev 2005-03-18 09:00:46 +01:00
ee2633a7e2 olap.test:
Added a test case for bug #8617.
sql_select.cc:
  Fixed bug #8617.
  Queries with ROLLUP and LIMIT n returned more than n rows
  if SQL_CALC_FOUND_ROWS was used.


sql/sql_select.cc:
  Fixed bug #8617.
  Queries with ROLLUP and LIMIT n returned more than n rows
  if SQL_CALC_FOUND_ROWS was used.
mysql-test/t/olap.test:
  Added a test case for bug #8617.
2005-03-17 20:18:19 -08:00
39a0645a8a Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
2005-03-17 11:48:11 -06:00
afe45b7328 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
2005-03-17 11:43:56 -06:00
04d2521f7c Merge frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0
into frost.snake.net:/Volumes/frost2/MySQL/bk/merge-4.1


BitKeeper/etc/logging_ok:
  auto-union
2005-03-17 11:42:51 -06:00
4878bc7449 Update URL. 2005-03-17 11:40:41 -06:00
6cd5a8c0be Update URL.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-17 11:33:07 -06:00
ba9a0fea50 Merge quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.1-4xeon


BitKeeper/etc/logging_ok:
  auto-union
sql/log_event.cc:
  Auto merged
2005-03-17 17:00:44 +01:00
05534c4df0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon


BitKeeper/etc/logging_ok:
  auto-union
2005-03-17 15:51:52 +01:00
93c928d3a7 safer creation of temp files used in replication of LOAD DATA INFILE.
When we come to create these, they may already exist and it's necessary to delete these old, useless copies.


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-17 14:39:39 +01:00
3e4ae65a14 Merge
sql/key.cc:
  Auto merged
mysql-test/r/update.result:
  SCCS merged
mysql-test/t/update.test:
  SCCS merged
2005-03-17 10:59:25 +04:00
7ceb5c6cef A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop).
sql/key.cc:
  A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop).
  For "partial" key parts (e.g. key(a(20), ...) we create different
  key_part->field, see sql/table.cc; so we have to use the eq() 
  function here to compare fields.
2005-03-17 10:24:50 +04:00