Commit graph

51161 commits

Author SHA1 Message Date
istruewing@stella.local
55a8f4c784 Bug#32663 binlog_multi_engine.test fails randomly
Disabled test case
2007-11-23 16:32:51 +01:00
istruewing@stella.local
08a757c03c Bug#32661 - Compiler warning in client/mysql.cc
Compiler warned about possible use of uninitialized variable
'warnings' in com_go().

Added LINT_INIT for 'warnings'.
2007-11-23 16:02:51 +01:00
istruewing@stella.local
9e450e76cd Bug#32659 - ndb_dd_backuprestore.test fails randomly
Disabled test case
2007-11-23 15:30:04 +01:00
istruewing@stella.local
75e9c20197 Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-23 15:04:39 +01:00
istruewing@stella.local
95c63ada55 BUG#31277 - myisamchk --unpack corrupts a table
Fixed a compiler warning on win64
2007-11-23 12:28:36 +01:00
istruewing@stella.local
17399e7be3 Bug#32651 - grant_cache.test fails
Disabled test case
2007-11-23 12:06:55 +01:00
istruewing@stella.local
e099b71f75 Merge stella.local:/home2/mydev/mysql-5.1-amain
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-23 09:14:49 +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
istruewing@stella.local
8ba6ecc7e4 Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-21 20:35:02 +01:00
istruewing@stella.local
3be5815015 Merge stella.local:/home2/mydev/mysql-5.1-amain
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-21 20:32:58 +01:00
istruewing@stella.local
82bf8f36f3 Merge stella.local:/home2/mydev/mysql-4.1-axmrg
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-21 20:31:47 +01:00
istruewing@stella.local
0d76c73fd5 Merge stella.local:/home2/mydev/mysql-5.0-amain
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-21 20:30:07 +01:00
istruewing@stella.local
ca95af018e Merge stella.local:/home2/mydev/mysql-4.1-amain
into  stella.local:/home2/mydev/mysql-4.1-axmrg
2007-11-21 20:27: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
istruewing@stella.local
f45c6f3107 Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-21 11:53:15 +01:00
istruewing@stella.local
f8a855a7c8 Merge stella.local:/home2/mydev/mysql-5.0-amain
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-21 09:31:08 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
92512e608a Fix for bug #32021: Using Date 000-00-01 in WHERE causes wrong result
Problem: caching 00000000-00000099 dates as integer values we're 
improperly shifting them up twice in the get_datetime_value().
  
Fix: don't shift cached DATETIME values up for the second time.
2007-11-21 08:01:00 +04: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
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
df@pippilotta.erinye.com
af3e8cb12d 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.1-build-work-18431
2007-11-19 14:55:15 +01:00
df@pippilotta.erinye.com
44ab4b2e7d Update readline to version 5.2. This fixes bug#18431. 2007-11-19 14:38:08 +01:00
istruewing@stella.local
81fc036f0c Merge stella.local:/home2/mydev/mysql-5.1-ateam
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-19 11:08:02 +01:00
istruewing@stella.local
3dc725882f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  stella.local:/home2/mydev/mysql-5.1-bug26379-8
2007-11-18 23:17:54 +01:00
istruewing@stella.local
b6831e182b Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
corrupts a MERGE table

Post-pushbuild fix for a Valgrind warning.
2007-11-18 20:28:37 +01:00
istruewing@stella.local
89bb56cdbe Merge stella.local:/home2/mydev/mysql-5.1-ateam
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-17 09:21:09 +01:00