Commit graph

51147 commits

Author SHA1 Message Date
mleich@four.local.lan
2a94ebf0a4 Merge four.local.lan:/work/merge/mysql-5.0-dev
into  four.local.lan:/work/merge/mysql-5.1-dev
2007-11-30 18:42:16 +01:00
mleich@four.local.lan
33b2d153b3 Merge four.local.lan:/work/merge/mysql-4.1-dev
into  four.local.lan:/work/merge/mysql-5.0-dev
2007-11-30 18:28:54 +01:00
mleich@four.local.lan
c3b8d8972f Fix for
Bug#31030 rpl000015.test fails if $MYSQL_TCP_PORT != 3306
Note:
  This bug does not occur in MySQL 5.0 and up, because
  ChangeSet 1.2328.2.1 2006/11/27 for MySQL 5.0 prevents this.
  The 5.0 fix uses the environment variable DEFAULT_MASTER_PORT
  which is set by mysql-test-run.pl.
  mysql-test-run.pl in 4.1 does not set this variable.
  There are two alternatives:
  1) Backport the 5.0 fix for this test including modifications
     to mysql-test-run.pl and mysql-test-run-shell.
     This is a not acceptable impact on an old MySQL version.
  2) Fix the problem different than in 5.0 like in the current
     ChangeSet + do not apply these changes when upmerging to 5.0
2007-11-30 18:06:28 +01:00
tsmith@ramayana.hindu.god
4f16ab2ea1 Cset exclude: tsmith@ramayana.hindu.god|ChangeSet|20071127191535|13686
This change isn't correct, and the correct one will be pulled in from another
repository.
2007-11-27 17:38:21 -07:00
tsmith@ramayana.hindu.god
44ba2ae716 Fix possible use of uninitialized variable during error handling in mysql.cc 2007-11-27 12:15:35 -07:00
hhunger@hh-nb.hhunger
ab12b26671 Merge hh-nb.hhunger:/work/trees/mysql-5.1-build-src-clean
into  hh-nb.hhunger:/work/merge/mysql-5.1-build
2007-11-27 13:01:27 +01:00
hhunger@hh-nb.hhunger
aa30bc517d post merge fix for bug#32496. 2007-11-26 22:50:12 +01:00
hhunger@hh-nb.hhunger
a075c70588 Merge hh-nb.hhunger:/work/merge/mysql-5.0-32496
into  hh-nb.hhunger:/work/merge/mysql-5.1-32496
2007-11-26 22:19:39 +01:00
hhunger@hh-nb.hhunger
10ea2aa927 patch for bug#32496 (2nd) with ansi conformant and Mysql test case. 2007-11-26 21:28:01 +01:00
msvensson@pilot.mysql.com
5ed3fdeabc Use myisam as default storage engine when running mysqld in --bootstrap
mode
2007-11-26 18:46:05 +01:00
kent@kent-amd64.(none)
e80ac8a1d4 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/kent/bk/docs-cleanup/mysql-5.1-build
2007-11-23 10:20:33 +01:00
kent@mysql.com/kent-amd64.(none)
ec2e2fc187 ReadMe.txt, INSTALL-WIN-SOURCE, INSTALL-BINARY, INSTALL-SOURCE:
Updated links to version 5.1 of the manual
2007-11-23 10:15:55 +01:00
kent@kent-amd64.(none)
3719bf6a1c Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/docs-cleanup/mysql-5.1-build
2007-11-23 10:15:22 +01:00
df@pippilotta.erinye.com
e9c0b566b2 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-22 18:21:06 +01:00
df@pippilotta.erinye.com
9ae1541c30 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-22 18:18:33 +01:00
df@pippilotta.erinye.com
bf6cf069f1 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
2007-11-22 18:07:09 +01:00
kent@kent-amd64.(none)
b60c1366ed Merge mysql.com:/home/kent/bk/docs-cleanup/mysql-5.0-build
into  mysql.com:/home/kent/bk/docs-cleanup/mysql-5.1-build
2007-11-22 17:53:47 +01:00
kent@kent-amd64.(none)
3a9202bd60 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/kent/bk/docs-cleanup/mysql-5.1-build
2007-11-22 17:52:36 +01:00
kent@mysql.com/kent-amd64.(none)
41778b565b Makefile.am, configure.in:
Include "manual.chm" in source TAR if it exists
2007-11-22 17:48:40 +01:00
serg@janus.mylan
ad1b342b30 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-11-21 21:29:16 +01:00
df@pippilotta.erinye.com
9d8981033d Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-11-21 19:44:40 +01:00
df@pippilotta.erinye.com
f67a748ab4 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-21 19:44:12 +01:00
df@pippilotta.erinye.com
8c88e1faa2 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-21 19:42:50 +01:00
df@pippilotta.erinye.com
cf7b21c005 add wrong warning to suppression file 2007-11-21 19:41:13 +01:00
df@pippilotta.erinye.com
ca249707a1 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-21 19:33:27 +01:00
mleich@five.local.lan
2bc3dba9c8 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
2007-11-21 18:55:27 +01:00
df@pippilotta.erinye.com
c25cbcec13 ignore readline warnings 2007-11-21 18:11:08 +01:00
mleich@five.local.lan
6ffbe3d076 Merge five.local.lan:/work/merge/mysql-5.0-build-30418
into  five.local.lan:/work/merge/mysql-5.1-build-31610
2007-11-21 15:06:38 +01:00
mleich@five.local.lan
4922727fb7 This changeset fixes
Bug#31567 "datadict" tests (all engines) fail:
             Reference protocol is non-standard build
   Bug#30418 "datadict" tests (all engines) fail:
             Dependency on the host name for ordering   
Modifications:
   1. The standard builds (build team) do not contain
      the collation 'utf8_general_cs'.
      The common developer builds (compuile-....-max)
      contain this collation.
      Solution fitting to both build variants:
         Exclude the collation 'utf8_general_cs' from
         result sets.
   2. Use mysqltest builtin sorting of result set for
      the statement where the hostname affects the
      row order.
2007-11-21 13:50:17 +01:00
tsmith@ramayana.hindu.god
56b9199ba3 Merge ramayana.hindu.god:/home/tsmith/m/bk/build/b25146/51
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
2007-11-20 20:35:14 -07:00
tsmith@ramayana.hindu.god
6a193c5528 Bug #25146: Some warnings/errors not shown when using --show-warnings
In several cases, an error when processing the query would cause mysql to
return to the top level without printing warnings.  Fix is to always
print any available warnings before returning to the top level.
2007-11-20 17:03:56 -07:00
tsmith@ramayana.hindu.god
3cfd655143 Minor update to allowed errors list in mysql-test's mtr_report.pl 2007-11-20 12:51:36 -07:00
tsmith@ramayana.hindu.god
eff821aeaa Applied InnoDB snapshot innodb-5.1-ss2093
Fixes the following bug:

- Bug #32125: Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase

  When unknown find_flag is encountered in convert_search_mode_to_innobase()
  do not call assert(0); instead queue a MySQL error using my_error() and
  return the error code PAGE_CUR_UNSUPP. Change the functions that call
  convert_search_mode_to_innobase() to handle that error code by "canceling"
  execution and returning appropriate error code further upstream.
2007-11-20 12:23:18 -07:00
tsmith@ramayana.hindu.god
f4d05a3cf1 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  ramayana.hindu.god:/home/tsmith/m/inno/nov19/51
2007-11-20 11:13:45 -07:00
tsmith@ramayana.hindu.god
ddffcae4c9 Merge ramayana.hindu.god:/home/tsmith/m/inno/nov19/50
into  ramayana.hindu.god:/home/tsmith/m/inno/nov19/51
2007-11-20 10:56:51 -07:00
tsmith@ramayana.hindu.god
2b985d0762 Applied InnoDB snapshot innodb-5.0-ss2095
Fixes the following bugs:

- Bug #29560: InnoDB >= 5.0.30 hangs on adaptive hash rw-lock 'waiting for an X-lock'

  Fixed a race condition in the rw_lock where an os_event_reset()
  can overwrite an earlier os_event_set() triggering an indefinite
  wait.
  NOTE: This fix for windows is different from that for other platforms.
  NOTE2: This bug is introduced in the scalability fix to the
  sync0arr which was applied to 5.0 only. Therefore, it need not be
  applied to the 5.1 tree. If we decide to port the scalability fix
  to 5.1 then this fix should be ported as well.

- Bug #32125: Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase

  When unknown find_flag is encountered in convert_search_mode_to_innobase()
  do not call assert(0); instead queue a MySQL error using my_error() and
  return the error code PAGE_CUR_UNSUPP. Change the functions that call
  convert_search_mode_to_innobase() to handle that error code by "canceling"
  execution and returning appropriate error code further upstream.
2007-11-20 10:53:19 -07:00
mleich@five.local.lan
f7fdbd591f Merge five.local.lan:/work/merge/mysql-5.1-build-31610
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
2007-11-20 17:17:16 +01:00
kent@kent-amd64.(none)
a1c5d290d2 Merge mysql.com:/home/kent/bk/tmpmerge/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmpmerge/mysql-5.1-build
2007-11-20 16:26:20 +01:00
kent@kent-amd64.(none)
cb6885c134 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/kent/bk/tmpmerge/mysql-5.0-build
2007-11-20 16:23:19 +01:00
mleich@five.local.lan
12e5d5b6be Fixes for the bugs
Bug#31610 Remove outdated and redundant tests:
                 partition_02myisam partition_03ndb
       Bug#32405 testsuite parts: partition_char_myisam wrong content
and cleanup of testsuite
   - remove/correct wrong comments
   - remove workarounds for fixed bugs
   - replace error numbers with error names
   - exclude subtests from execution which fail now because of
     new limitations for partitioning functions
   - remove code for the no more intended dual use
     fast test in regression tests/slow test in testsuite
   - analyze and fix problems with partition_char_innodb
   - fix problems caused by last change of error numbers
   - Introduce error name to error number mapping which makes
     maintenance after next error renumbering easier
2007-11-20 16:04:07 +01:00
dfischer/mysqldev@mysql.com/production.mysql.com
4b94aec52a Raise version number after cloning 5.0.52 2007-11-20 11:26:16 +01:00
joerg@trift2.
be638f606f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/push-5.1
2007-11-19 23:03:43 +01:00
tsmith@ramayana.hindu.god
24f4a710ea Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
2007-11-19 13:40:49 -07:00
joerg@trift2.
504e0980f2 The error number for ER_ILLEGAL_HA_CREATE_OPTION changed from 1477 to 1478,
this must be reflected in the test result files.
2007-11-19 21:24:36 +01:00
tsmith@ramayana.hindu.god
dc403f8128 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2007-11-19 13:17:58 -07:00
serg@janus.mylan
5846b0f270 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-11-19 17:21:35 +01:00
serg@janus.mylan
6f689c91d8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-11-19 17:12:49 +01:00
df@pippilotta.erinye.com
da487329dd Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-19 16:05:10 +01:00
df@pippilotta.erinye.com
de9eeef2e4 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-18431
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-19 16:02:15 +01:00
df@pippilotta.erinye.com
d3b0403a1b Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-18431
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-11-19 15:42:12 +01:00