Commit graph

35 commits

Author SHA1 Message Date
monty@mysql.com
3c12d0ae54 Added end marker for tests to make future merges easier 2005-07-28 03:22:47 +03:00
ingo@mysql.com
26f2e57ecb Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
After review version.
Added a condition for MERGE tables. These do not have unique
indexes. But every key could be a unique key on the underlying
MyISAM table. So get the maximum key length for MERGE tables
instead of the maximum unique key length. This is used for
buffer allocation in write_record().
2005-05-18 19:40:39 +02:00
timour@mysql.com
5eab756a63 Fix for BUG#7377. This fix adds the same implementation for ha_myisammgr::index_type as in version 5.0. 2004-12-27 14:05:35 +02:00
sergefp@mysql.com
0bf584d9a5 Fix and testcase for BUG#6699 2004-11-29 06:51:30 +03:00
monty@mysql.com
9d8555c0f0 Merge with 4.0 to get latest bug fixes 2004-09-04 15:59:49 +03:00
ram@gw.mysql.r18.ru
3acccb988a A fix (Bug #5232: CREATE TABLE ... SELECT can deadlock itself). 2004-08-27 16:43:01 +05:00
serg@serg.mylan
3b59dd1bd0 bug#4008 - merge table cannot determine what key caused "dupl. key" error 2004-06-25 15:12:13 +02:00
serg@serg.mylan
c4b55a2aea drop tables in windows-compatible order 2004-03-04 14:47:33 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
fcf96dbb18 WorkLog#1323
Deprecate the use of TYPE=... Preferred syntax is ENGINE=
2003-12-10 04:31:42 +00:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
monty@narttu.mysql.fi
c21728f8c8 Cleaner implementation if INSERT ... SELECT with same tables
Tests cleanup (put drop database first in tests)
2003-07-03 11:55:36 +03:00
monty@mashka.mysql.fi
a6755acb4e Fix needed to support MERGE tables in different databases 2003-07-01 15:49:32 +03:00
monty@mashka.mysql.fi
dfac0fc90a Allow one to use MERGE tables with tables from different databases
Added command 'replace_column' to mysqltest
2003-06-27 16:29:10 +03:00
monty@mashka.mysql.fi
76f146a175 Merge with 4.0.9 2003-01-18 03:13:37 +02:00
serg@serg.mysql.com
c16e908a2b bugfix for 'ANALYZE for MERGE' and table-less MERGE table 2003-01-16 13:23:33 +01:00
monty@mashka.mysql.fi
1f6ecc0cd3 Changed mysql-test to print warnings for not existing table to DROP TABLE
Cleaned up test; Removed wrong DROP TABLE commands and use standard table and database names.
changed store_warning() -> push_warning_print()
2003-01-06 01:48:59 +02:00
monty@mashka.mysql.fi
d49167bae5 Fixes for binary protocol (complement to last push)
Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format.
DATE_ADD() and related functions now returns correct DATE/DATETIME type depending on argument types.
Now all tests passes, still some work left to remove warnings in log files from mysql-test-run
2002-12-14 17:43:01 +02:00
serg@serg.mysql.com
0a75fe85d1 merge::records_in_range and optimizer 2002-11-17 18:58:03 +01:00
serg@sergbook.mysql.com
d4783821ba merged 2002-11-05 17:10:31 +01:00
serg@sergbook.mysql.com
27d07047bb TEMPORARY MERGE tables are allowed 2002-11-05 00:00:51 +01:00
serg@sergbook.mysql.com
a4384f852f merge.test:
merge.test - it was missed in the previous commit :(
manual.texi:
  fixed bad auto-merge of OLAP manual 
Docs/Makefile.am:
  removed ../MIRROR target (mirror list is no longer in the manual)
2002-07-22 00:46:30 +02:00
Sinisa@sinisa.nasamreza.org
6ad30c9b2d Fixed some comments , plus introduced some tests so that I do not
make some new mistakes.
2002-06-18 17:38:06 +03:00
Sinisa@sinisa.nasamreza.org
138e5d57eb Fixed a bug in optimiser with MERGE tables with non-unique values
with aggregating functions.

This consistently crashed Mysql
2002-06-15 20:59:42 +03:00
monty@tik.mysql.fi
e05bf277d6 Final fixes for INSERT into MERGE tables.
Move MAX_BLOB_WIDTH to be global
Added full support for unsigned BIGINT
Fixed spelling errors
2001-09-27 21:45:48 +03:00
monty@work.mysql.com
18474d8419 Merge with 3.23.42 2001-09-13 09:52:35 +02:00
monty@tik.mysql.fi
46f944f4a4 First drop merge table, then other tables 2001-09-12 00:11:18 +03:00
monty@hundin.mysql.fi
b4ec9cf608 Cleanups 2001-09-07 22:38:45 +03:00
monty@hundin.mysql.fi
2f93aa9e51 Test that all MERGE tables comes from the same database 2001-08-29 17:33:41 +03:00
monty@donna.mysql.fi
25a129c96f Force close of sockets on HPUX 10.20
Support option lines longer than 256 chars.
Close the slow log at shutdown.
Always allow debug options to mysqld.
Change some DBUG_PRINT tags.
2001-05-19 10:14:05 +03:00
serg@serg.mysql.com
b6138af000 Fulltext manual changed, MERGE bug fixed 2001-05-16 23:06:30 +02:00
monty@donna.mysql.fi
bda3e09935 Merged some functions and removed some unused client functions.
Remember UNION for ALTER TABLE
Added test for if we are supporting transactions.
Don't allow REPLACE to replace a row when we have generated an auto_increment key
Fixed bug when using BLOB keys
Fixed bug in SET @variable=user.
2001-03-06 15:24:08 +02:00
monty@donna.mysql.com
c533308a15 Added Innobase to source distribution 2001-02-17 14:19:19 +02:00
monty@donna.mysql.com
ce2260586d Fixed ALTER TABLE on MERGE tables
Fixed bug in DISTINCT
2001-01-28 21:35:50 +02:00
monty@donna.mysql.com
62771338ca Changes for --with-server-suffix
Fixed mutex bug in logging (crash on windows when doing SET PASSWORD=)
Changed MERGE  tables to not use FILE
2001-01-21 16:30:16 +02:00
monty@donna.mysql.com
c0f40d14cc Added support for hex strings to mysqlimport
A lot of new tests to mysqltest
Fixed bug with BDB tables and autocommit
2000-12-28 03:56:38 +02:00