Commit graph

30 commits

Author SHA1 Message Date
svoj@mysql.com/april.(none)
2de51adffa Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines
2006-09-28 22:14:31 +05:00
svoj@mysql.com/april.(none)
b271d7653b BUG#21617 - crash when selecting from merge table with inconsistent indexes
Crash may happen when selecting from a merge table that has underlying
tables with less indexes than in a merge table itself.

If number of keys in merge table is not bigger than requested key number,
return error.
2006-09-28 22:10:06 +05:00
svoj@mysql.com/april.(none)
c0ebc0fb2a BUG#10974 - No error message if merge table based on union of innodb, memory
Fixed confusing error message from the storage engine when
it fails to open underlying table. The error message is issued
when a table is _opened_ (not when it is created).
2006-09-20 01:40:59 +05:00
reggie@mdk10.(none)
c9e7c0fd56 BUG# 10687: MERGE Engine fails on Windows
This is a replacement for the original patch given by Ingo.  This one comes
from Monty.
The problem is that merge files now use unix style pathnames on all 
platforms.  The merge file open code was not properly converting those
pathnames back to non-unix when necessary.
2005-05-23 11:53:16 -05:00
ingo@mysql.com
1f0d0a6729 BUG#5964 - 4.1 MERGE tables regression from 4.0
Changed the creation of the .MRG file so that only the table  name
is written when the MyISAM table is in the same database as the
MERGE table, a relative path is used in other cases in mysqld,
and possibly an absolute path is used in an embedded server.
No test case is added as the external behaviour is unchanged.
Only the file names within the .MRG file are changed.
2005-04-28 18:28:50 +02:00
monty@mysql.com
6adaff23a4 Review of new pushed code (Indentation fixes and simple optimizations)
Use 'mysqltest' as test database instead of test_$1 or test1,test2 to not accidently delete an important database
Safety fix for mailformed MERGE files
2004-08-31 14:35:04 +03:00
serg@serg.mylan
a835e9bc9c unnecessary LINT_INIT removed 2004-08-23 13:43:55 +02:00
serg@serg.mylan
d5bf903e4d after merge fixes 2004-08-22 12:43:26 +02:00
serg@serg.mylan
99bb6ff7a0 ported bugfix for #2408 from 3.23
(cannot call it a "merge" :)
2004-08-22 10:22:59 +02:00
serg@serg.mylan
ca35127739 bug#2408 - Multiple threads altering MERGE table UNIONs hang/crash.
Abandoned improper use of MyISAM data.
Thanks Ingo!
2004-08-22 09:36:17 +02:00
serg@serg.mylan
25b16cd6ce bug #702 - ALTER TABLE tm UNION=(t1,t2) doesn't work if t1.MYD is compressed 2003-07-15 20:43:57 +02:00
serg@serg.mysql.com
1ced5948f0 low-level error messages cleanup 2003-01-28 17:42:08 +01:00
monty@mashka.mysql.fi
62dfd57475 Removed compiler warnings
Fixed wrong variable name for Windows
2002-12-12 21:01:32 +02:00
serg@serg.mysql.com
94cb1daa52 ANALYZE for MERGE 2002-12-10 00:06:05 +01:00
serg@serg.mysql.com
076fc1a621 myrg_open.c:
comment fixed, bad flag hack removed
2002-06-22 17:44:04 +00:00
monty@hundin.mysql.fi
b658662ae4 Update copyright
Fixed memory leak on shutdown (Affects the embedded version & MyODBC)
2001-12-06 14:10:51 +02:00
monty@hundin.mysql.fi
88aff4bf85 Updated manual about embedded version.
Speed up column-completion in 'mysql'
Don't use ISAM if HAVE_ISAM is not defined
A lot of fixes for the embedded version.  All libraries are now included in libmysqld.a
Changed arguments to convert_dirname() to make it more general.
Renamed files in the 'merge' directory to all use a common prefix.
Don't compile both assembler and C functions on x86
2001-10-08 04:58:07 +03:00
monty@hundin.mysql.fi
e390a99573 Added support of INSERT to MERGE tables
Fixes for embedded libary and openssl
2001-09-22 17:40:57 +03:00
monty@work.mysql.com
447c18954e merge with 3.23.42 2001-09-02 18:38:33 +02:00
monty@hundin.mysql.fi
1dba0d7005 Fix problem with comments/blank lines in MERGE files. 2001-08-30 11:20:28 +03:00
monty@hundin.mysql.fi
733f865f54 Fixes for OS2.
Fix bug in isamlog
Add argument types to function declarations.
2001-08-22 01:45:07 +03:00
monty@donna.mysql.fi
03f94c5c8d Only mark MERGE readonly if all tables are readonly
Optimize some queries when using LIMIT
2001-05-12 14:03:53 +03:00
monty@donna.mysql.com
a7c5b9c211 Portability fixes for OPENBSD, OS2 and Windows 2001-01-27 01:20:56 +02:00
sasha@mysql.sashanet.com
b63444de1b client/mysqltest.c
added system command
myisammrg/myrg_open.c
    fixed coredump when opening an empty union table
sql/sql_repl.cc
    fixed warnings, remove confusing comment, fixed coredump in
    change master to when master.info was corrupted

added new replication test case
2000-12-14 17:43:13 -07:00
serg@serg.mysql.com
a87be9c6ed ignore cleaned up, AGAIN!
myrg_open.c	delayed queue allocation
2000-12-09 00:41:06 +01:00
monty@donna.mysql.com
df280335b0 Fix for SAFE_MUTEX + MERGE tables 2000-09-21 01:58:38 +03:00
monty@donna.mysql.com
751f2d1f16 Faster log::write() call, memory leak fix, flush master fix. 2000-09-16 04:27:21 +03:00
monty@donna.mysql.com
b581f17be2 Fixes for MERGE TABLES and HEAP tables 2000-09-14 02:39:07 +03:00
serg@infomag.ape.relarn.ru
5886090182 PART I: Keys support for MyMERGE tables
myisammrg/             |
Makefile.am            |
mymrgdef.h             |   support for keys
myrg_open.c            |          &
myrg_queue.c           |   bugfixes
myrg_rfirst.c          |
myrg_rkey.c            |
myrg_rlast.c           |
myrg_rnext.c           |
myrg_rprev.c           |
myrg_rrnd.c            |

include/myisammrg.h    | rkey/rnext/etc prototyped

sql/                   |
ha_myisammrg.cc        | support for keys
ha_myisammrg.h         |

myisam/                |
mi_rkey.c              | buf==NULL extension, _mi_rkey()
mi_rnext.c             |
mi_rprev.c             |

include/queues.h       | reinit_queue() - same as init_queue, but w/o malloc
mysys/queues.c         |

PART II: Miscellaneous

myisam/common_words    | deleted (looks like I checked it in by mistake)

some files (like acconfig.h, Makefile.am, COPYING.LIB, etc)
                       | Change mode to -rw-r--r-- (by `chmod a-x ')
2000-08-14 15:27:19 +04:00
bk@work.mysql.com
f4c589ff6c Import changeset 2000-07-31 21:29:14 +02:00