mariadb/storage
Alexander Nozdrin fe5bcb475c Backport of
- revid:sp1r-svoj@mysql.com/june.mysql.com-20080324111246-00461
  - revid:sp1r-svoj@mysql.com/june.mysql.com-20080414125521-40866

  BUG#35274 - merge table doesn't need any base tables, gives
              error 124 when key accessed

  SELECT queries that use index against a merge table with empty
  underlying tables list may return with error "Got error 124 from
  storage engine".

  The problem was that wrong error being returned.

mysql-test/r/merge.result:
  Backport of
    - revid:sp1r-svoj@mysql.com/june.mysql.com-20080324111246-00461
    - revid:sp1r-svoj@mysql.com/june.mysql.com-20080414125521-40866
  
    A test case for BUG#35274.
  
    Modified a test case according to fix for BUG#35274. Key based
    reads are now allowed for merge tables with no underlying tables
    defined.
mysql-test/t/merge.test:
  Backport of
    - revid:sp1r-svoj@mysql.com/june.mysql.com-20080324111246-00461
    - revid:sp1r-svoj@mysql.com/june.mysql.com-20080414125521-40866
  
    A test case for BUG#35274.
  
    Modified a test case according to fix for BUG#35274. Key based
    reads are now allowed for merge tables with no underlying tables
    defined.
storage/myisammrg/myrg_queue.c:
  Backport of
    - revid:sp1r-svoj@mysql.com/june.mysql.com-20080324111246-00461
    - revid:sp1r-svoj@mysql.com/june.mysql.com-20080414125521-40866
  
    Return "end of file" error instead of "wrong index" error when
    we got a merge table with empty underlying tables list.
  
    In 5.1 we cannot rely on info->open_tables value when checking
    if a merge table has no underlying tables defined.
    Use info->tables instead.
2010-05-31 17:38:02 +04:00
..
archive Manual merge from mysql-trunk. 2010-05-20 16:35:28 +04:00
blackhole Another incarnation of the patch for Bug#30708 2010-05-19 17:00:23 +04:00
csv Another incarnation of the patch for Bug#30708 2010-05-19 17:00:23 +04:00
example Another incarnation of the patch for Bug#30708 2010-05-19 17:00:23 +04:00
federated Another incarnation of the patch for Bug#30708 2010-05-19 17:00:23 +04:00
heap Patch for Bug#53937 (Junk make-ccc files included in MySQL Server bzr repo). 2010-05-26 14:20:14 +04:00
ibmdb2i Another incarnation of the patch for Bug#30708 2010-05-19 17:00:23 +04:00
innobase Bug #53445 Build with -Wall and fix warnings that it generates 2010-05-26 16:12:23 +02:00
myisam Backport: Remove unused and ancient files, functions, and facilities. 2010-05-28 19:13:31 -03:00
myisammrg Backport of 2010-05-31 17:38:02 +04:00
ndb Another incarnation of the patch for Bug#30708 2010-05-19 17:00:23 +04:00
perfschema Fix perfschema unittests build on Windows 2010-04-13 13:48:46 +02:00
Makefile.am Another incarnation of the patch for Bug#30708 2010-05-19 17:00:23 +04:00