Commit graph

18231 commits

Author SHA1 Message Date
unknown
ccd4e77be7 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug9103
2005-04-20 12:11:06 +04:00
unknown
9b1db3efda - Enabled the "blackhole" storage engine for the Max RPM subpackage 2005-04-20 08:39:08 +02:00
unknown
6a97b07994 sql_select.cc:
Fixed bug #9681.
  The bug happened with queries using derived tables specified by
  a SELECT with ROLLUP, such as:
  SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2,
  if column a of table t1 is declared as NOT NULL.
  This was to the fact that the first column of the temporary table
  created to contain the derived table erroneously inherited the NOT NULL
  attribute from column a.
olap.result, olap.test:
  Added a test case for bug #9681.


mysql-test/t/olap.test:
  Added a test case for bug #9681.
mysql-test/r/olap.result:
  Added a test case for bug #9681.
sql/sql_select.cc:
  Fixed bug #9681.
  The bug happened with queries using derived tables specified by
  a SELECT with ROLLUP, such as:
  SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2,
  if column a of table t1 is declared as NOT NULL.
  This was to the fact that the first column of the temporary table
  created to contain the derived table erroneously inherited the NOT NULL
  attribute from column a.
2005-04-19 16:54:30 -07:00
unknown
6a15a7334e Disabled ndb tests for embedded 2005-04-19 17:23:49 +02:00
unknown
33ea3ff345 - manual merge
sql/share/Makefile.am:
  Auto merged
2005-04-19 17:18:56 +02:00
unknown
1f1a579aa9 - added missing copyright headers to several Makefile.am's (noticed
while testing changes to the mysql-copyright scripts


libmysqld/examples/Makefile.am:
  - added a copyright header
sql/share/Makefile.am:
  - added a copyright header
tools/Makefile.am:
  - added a copyright header
2005-04-19 17:00:05 +02:00
unknown
3be2d4897e Bug#7806 - insert on duplicate key and auto-update of timestamp
Modified the check for the timestamp field so that the flags for
the automatic for inserts and updates are cleared independently.


mysql-test/r/type_timestamp.result:
  Bug#7806 - insert on duplicate key and auto-update of timestamp
  The test result.
mysql-test/t/type_timestamp.test:
  Bug#7806 - insert on duplicate key and auto-update of timestamp
  The test case.
sql/mysql_priv.h:
  Bug#7806 - insert on duplicate key and auto-update of timestamp
  Made check_insert_fields() static. It is used only in sql_insert.cc.
sql/sql_insert.cc:
  Bug#7806 - insert on duplicate key and auto-update of timestamp
  Modified the check of the insert fields so that an explicit
  assignment of the timestamp field does only disable the automatic
  for inserts and retains the automatic for updates.
  Added a check if the update fields contain the timestamp field.
  In this case, the automatic on update is disabled, but not the
  automatic on insert. This is called from mysql_prepare_insert().
sql/table.h:
  Bug#7806 - insert on duplicate key and auto-update of timestamp
  Extended a comment to warn about usage of enum timestamp_auto_set_type.
2005-04-19 15:12:32 +02:00
unknown
eb72815b6f InnoDB: Truncate SHOW INNODB STATUS output at the start of the list
of active transactions, if necessary and possible.  (Bug #5436)


innobase/include/lock0lock.h:
  Split lock_print_info() into lock_print_info_summary()
  and lock_print_info_all_transactions().
innobase/lock/lock0lock.c:
  Split lock_print_info() into lock_print_info_summary()
  and lock_print_info_all_transactions().
innobase/include/srv0srv.h:
  srv_printf_innodb_monitor(): Add output parameters trx_start and trx_end.
innobase/srv/srv0srv.c:
  srv_printf_innodb_monitor(): Add output parameters trx_start and trx_end.
sql/ha_innodb.cc:
  innodb_show_status(): Truncate oversized output at the beginning
  of the list of active transactions, if possible.
2005-04-19 14:35:47 +03:00
unknown
d0b6c36460 Updated Docs/Makefile.am:
- fixed copyright header and removed obsolete comments about how to
  build the manual using texinfo
- added an "install-data-hook" to install the mysql.info info page.
  This seems to be the only way to install info pages, if they are not
  built from texinfo sources directly.


Docs/Makefile.am:
  - fixed copyright header and removed obsolete comments about how to
    build the manual using texinfo
  - added an "install-data-hook" to install the mysql.info info page.
    This seems to be the only way to install info pages, if they are not
    built from texinfo sources directly.
2005-04-19 13:33:38 +02:00
unknown
7b1c02318e BUG#9568 mysql segfaults from CTRL-R
- Segfault because of passing a 64-bit pointer to 32 bit integer.
 - Add new include  config_readline.h which will calculate some new defines 
   based on what is found in config.h
 - This file was originally included in readline 4.3 as config.h.in, only the part that
    makes new defines have been moved to this file. 


cmd-line-utils/readline/bind.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/callback.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/complete.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/display.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/funmap.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/histexpand.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/histfile.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/history.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/histsearch.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/input.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/isearch.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/keymaps.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/kill.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/macro.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/mbutil.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/misc.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/nls.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/parens.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/readline.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/rltty.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/search.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/shell.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/signals.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/terminal.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/text.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/tilde.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/undo.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/util.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/vi_mode.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/xmalloc.c:
  Include local config_readline.h instead of config.h
2005-04-19 13:12:19 +02:00
unknown
254dfb2be0 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-04-19 13:59:09 +03:00
unknown
432bc644c4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-19 12:51:20 +02:00
unknown
a437b82aff A fix (bug #9837: round(1, 6) delivers wrong value in create table context).
sql/item_func.cc:
  A fix (bug #9837: round(1, 6) delivers wrong value in create table context).
  As we change decimals, we should change max_length accordingly.
2005-04-19 14:44:54 +05:00
unknown
fd9d58c413 Fix for Bug #9691 UPDATE fails on attempt to update primary key 2005-04-19 11:21:26 +02:00
unknown
92a00143d7 CSC5149 - ndb test programs
Fix src distributions for benchmark prg
2005-04-19 11:17:32 +02:00
unknown
c14f04957e - removed COPYING from txt_files of Docs/Makefile.am
(it's already in EXTRA_DIST of the toplevel Makefile.am)


Docs/Makefile.am:
  - removed COPYING from txt_files (it's already in EXTRA_DIST of the toplevel
    Makefile.am)
2005-04-19 11:15:36 +02:00
unknown
992d230591 Style change. Use 1 and 0 instead of true and false. 2005-04-19 08:23:03 +03:00
unknown
24dd3ea806 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg8086
2005-04-18 15:04:50 +04:00
unknown
135c7b5a1d bug#9892
Make BUILDINDX RF_LOCAL aware


ndb/src/ndbapi/Ndbif.cpp:
  allow TCKEY_FAILREF w/ invalid magic number also when NDB_NODROPPED_SIGNAL
ndb/test/ndbapi/testIndex.cpp:
  Run only 1 update thread during NFNR2_O
2005-04-18 12:41:12 +02:00
unknown
4594ea1fd1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg8086
2005-04-18 13:54:42 +04:00
unknown
56ea770272 Fixed a bug: deadlock without any locking, simple select and update (Bug #7975).
Backported from 5.0.3.


innobase/row/row0ins.c:
  If the SQL-query will update or replace duplicate records we take X-lock
  for duplicate records.
sql/ha_innodb.cc:
  INSERT ON DUPLICATE KEY UPDATE will also update duplicate records and we should
  take X-lock in this case for duplicate records.
2005-04-18 12:17:32 +03:00
unknown
11652c1f45 Fix for BUG#9298: Make int->string conversion sign-aware in Protocol_simple::store_long
mysql-test/r/group_by.result:
  Testcase for BUG#9298
mysql-test/t/group_by.test:
  Testcase for BUG#9298
2005-04-18 07:26:23 +04:00
unknown
955ec71f78 Fix for BUG#9103:
Don't produce data truncation warnings from within cp_buffer_from_ref(). This function
is only used to make index search tuples and data truncation that occurs here has no
relation with truncated values being saved into tables.


mysql-test/r/update.result:
  Testcase for BUG#9103
mysql-test/t/update.test:
  Testcase for BUG#9103
sql/opt_range.cc:
  cp_buffer_from_ref now has THD* parameter
sql/sql_select.h:
  cp_buffer_from_ref now has THD* parameter
2005-04-18 05:21:44 +04:00
unknown
b51f70b81e Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug9439
2005-04-17 20:56:36 +04:00
unknown
1780ad4940 Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build


support-files/MacOSX/Makefile.am:
  Auto merged
2005-04-17 12:48:33 +02:00
unknown
ff3d799a05 - removed ReadMe.txt from CLEANFILES, as it's cleaned by Docs/Makefile.am
already (and that's the Makefile that acutally creates it)
2005-04-17 12:44:59 +02:00
unknown
3c112262b5 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-look-range
2005-04-17 02:06:17 +04:00
unknown
6b00231421 Fix for BUG#9348: when computing union of two intervals set lower bound to
minimum of lower bounds of two joined intervals.


mysql-test/r/range.result:
  Testcase for BUG#9348
mysql-test/t/range.test:
  Testcase for BUG#9348
2005-04-17 02:05:09 +04:00
unknown
9e5325ab5c Fix for BUG#9439:
Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)
(this is the final cset with proper tests)


mysql-test/r/show_check.result:
  Testcase for BUG#9439
mysql-test/t/show_check.test:
  Testcase for BUG#9439
sql/sql_show.cc:
  Fix for BUG#9439:
  Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)
2005-04-16 23:35:39 +04:00
unknown
ec280d6ffb Merge mysql.com:/home/mydev/mysql-4.1-bug9487
into mysql.com:/home/mydev/mysql-4.1-bug9188
2005-04-16 20:56:21 +02:00
unknown
f3feba87a2 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug9487
2005-04-16 18:56:46 +02:00
unknown
dacff5a908 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug9188
2005-04-16 17:44:04 +02:00
unknown
4528fd1527 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-16 10:14:43 +02:00
unknown
9b224e9180 Ensure that all privilege tables are created in MyISAM 2005-04-16 04:12:30 +03:00
unknown
0327d05c69 Fixed core dump with long timezone names
Don't abort on bootstrap if a wrong --default-storage-engine is specified


sql/handler.cc:
  Combined code
sql/mysqld.cc:
  Fixed core dump with long timezone names
  Don't abort on bootstrap if a wrong --default-storage-engine is specified
  Don't print strange messages if one sends 'kill' to a mysqld --bootstrap
sql/set_var.cc:
  Indentaion change
2005-04-16 03:40:33 +03:00
unknown
0a1b13c99c Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-16 00:34:05 +02:00
unknown
f75a518853 merged
sql/sql_lex.cc:
  ul
2005-04-16 00:10:35 +02:00
unknown
bd4c929ba6 Merge mysql.com:/home/jimw/my/mysql-4.1-9833
into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/mysqld.cc:
  Auto merged
2005-04-15 11:52:58 -07:00
unknown
484943a2af Merge mysql.com:/home/jimw/my/mysql-4.1-9815
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-15 11:52:35 -07:00
unknown
315f66c8e2 Merge mysql.com:/home/jimw/my/mysql-4.1-9852
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-15 11:51:41 -07:00
unknown
7fe3db99c8 Bug#9487 - myisampack segmentation violation and bus error
Fixed some casts for 64-bit systems.
Fixed a possible buffer overflow.


myisam/myisampack.c:
  Bug#9487 - myisampack segmentation violation and bus error
  Added or changed proper casts for the argument of flush_buffer().
  Added a check for the counterstrike of the trick to have
  file_buffer.end some bytes below the real end of the buffer.
2005-04-15 19:26:38 +02:00
unknown
e2d9929d2c BUG#9922 - INSERT SELECT with UNIONs allows concurrent INSERTs
don't set lex->lock_option=TL_READ in the parser for SELECT
2005-04-15 19:20:15 +02:00
unknown
b753fd96b2 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug9188
2005-04-15 17:16:42 +02:00
unknown
6b75a704e8 Bug #9839 Column with AUTOINC contains -1 Value on node stop, post review fix 2005-04-15 16:14:08 +02:00
unknown
b112ccb583 Bug #9839 Column with AUTOINC contains -1 Value on node stop 2005-04-15 15:52:07 +02:00
unknown
65e4b8ff3b Fix mysql.server.sh to use shell functions as replacement
for LSB init functions when they aren't available. (Bug #9852)


support-files/mysql.server.sh:
  Use shell function instead of less portable alias command
  to create replacements for LSB functions, and also use
  argument in our replacements.
2005-04-14 17:22:18 -07:00
unknown
e2e5191155 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-14 23:08:12 +02:00
unknown
2a8f6bb188 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-04-14 22:09:38 +02:00
unknown
c8723e7f95 merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
2005-04-14 21:31:22 +02:00
unknown
ce22ebd02d fil0fil.c:
Add fault tolerance in the scan of .ibd files at a crash recovery; formerly a single failure of readdir_get_next caused the rest of the directory to be skipped


innobase/fil/fil0fil.c:
  Add fault tolerance in the scan of .ibd files at a crash recovery; formerly a single failure of readdir_get_next caused the rest of the directory to be skipped
2005-04-14 22:27:15 +03:00