monty@mysql.com
8f6ed291a7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/my/mysql-5.1
2006-05-04 01:58:21 +03:00
holyfoot@mysql.com
2f7ac18f22
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-05-04 02:17:17 +05:00
pekka@mysql.com
ec42119233
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my50
2006-05-03 23:17:16 +02:00
monty@mysql.com
d689f2fa70
Cleanups after review of WL#602
...
Fixed warnings from test suite
Some fixes in mysql-test-run script to catch more warnings
2006-05-03 19:40:52 +03:00
monty@mysql.com
343644dd5d
Added support for key_block_size for key and table level (WL#602)
...
Added support for key_block_size to MyISAM.
Simplify interface to 'new Key' to make it easier to add new key options.
mysqld option --new is used to define where key options are printed.
(In 5.3 we should move all key options to after key part definition to avoid problem with reserved names)
Fixed some compiler warnings and a memory leak in ssl
2006-05-03 15:59:17 +03:00
holyfoot@deer.(none)
81e625ac4a
merging fix
2006-05-03 17:43:32 +05:00
holyfoot@mysql.com
7ee205f67a
merging
2006-05-03 16:42:39 +05:00
holyfoot@mysql.com
9de68b8122
merging
2006-05-03 16:33:42 +05:00
holyfoot@mysql.com
0007484c26
Merge mysql.com:/home/hf/work/mysql-4.1.15225
...
into mysql.com:/home/hf/work/mysql-4.1.mrg
2006-05-03 15:51:19 +05:00
mikael@zim.(none)
fdb8043efe
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/mikael/bug19313
2006-05-03 01:04:14 -07:00
ramil@mysql.com
b337e83db2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b7643
2006-05-02 11:33:26 +05:00
cmiller@zippy.(none)
21bec19920
Merge zippy.(none):/home/cmiller/work/mysql/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new
2006-05-01 13:41:40 -04:00
cmiller@zippy.(none)
6af3f88f07
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
2006-05-01 09:46:00 -04:00
elliot@mysql.com
604b5836bb
BUG#19145: mysqld crashes if you set the default value of an enum field to NULL
...
Now test for NULLness the pointers returned from objects created from the
default value. Pushing patch on behalf of cmiller.
2006-04-28 12:15:29 -04:00
mikael@zim.(none)
5b3bf39987
BUG#19313: Crash after mysqld starts and stops immediately afterwards.
2006-04-25 14:33:54 -07:00
ingo@mysql.com
d49ecc49c8
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug18129
2006-04-25 16:32:38 +02:00
ramil@mysql.com
815da9ccee
Fix for bug #7643 : ALTER TABLE fails for CSV, EXAMPLE, ARCHIVE engines
2006-04-25 15:27:28 +05:00
Magnus@hugo.
0f51bcc35d
Fix windows compile problem
2006-04-22 13:29:05 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
33eccd0c1e
WL 2826: Error handling of ALTER TABLE for partitioning
...
Fixed merge issue
2006-04-22 04:38:19 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c949342101
Merge mronstrom@bk-internal.mysql.com:/home/bk/bugs/bug16002
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
2006-04-21 09:52:51 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
82dfff9d08
BUG#19067: Crash when ALTER TABLE for default subpartitioned table
2006-04-21 08:43:07 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
6473c10445
WL 2826: Error handling of ALTER TABLE for partitioning
...
Final review fixes
2006-04-21 08:35:25 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
14d75e5b9f
WL 2826: Error handling of ALTER TABLE for partitioning
...
Fixed up create_handler_files call
2006-04-19 21:43:30 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
09e95da616
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
2006-04-19 21:22:35 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c9085e5189
WL2826: Error handling of ALTER TABLE for partitioning
...
Actual error reported in my_errno from my_delete
2006-04-19 20:57:42 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
dd257b22dc
WL 2826: Error handling of ALTER TABLE for partitioning
...
Various bug fixes (mostly mixed to and from in replace methods)
2006-04-19 20:04:00 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
0a053c3d8c
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-wl2826
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
2006-04-19 16:19:21 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
f78195049d
WL 2826: Error handling of ALTER TABLE for partitioning
...
Fixed a number of bugs
2006-04-19 16:08:59 -04:00
bar@mysql.com
cedafc30e8
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
2006-04-19 09:50:17 +05:00
mikron@c-ae09e253.1238-1-64736c10.cust.bredbandsbolaget.se
eb60344d78
WL 2826: Error handling of ALTER TABLE for partitioning
...
Use \0 to indicate frm-file
Add more comments
Add more #ifdef code missing previously
2006-04-18 16:58:12 +02:00
mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se
cef06fdb61
BUG#16002: Make partition functions that are unsigned work properly
2006-04-17 22:51:34 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
8ae26a2868
WL 2826: Error handling of ALTER TABLE for partitioning
...
After review changes
2006-04-15 21:49:13 -04:00
brian@zim.(none)
5d1d27c016
Final patch to remove the last of the OS2 support.
2006-04-15 18:17:32 -07:00
ingo@mysql.com
56d414b057
Bug#18129 - Fast (online) add index leaves temporary table frm in case of errors
...
ALTER TABLE temporarily creates a new table with a .frm
file and optionally other files. For fast ALTER TABLE
only the .frm file is created. If the operation succeeds,
The temporary files are renamed to their final target.
In case of an error, the temporary file was forgotten to
remove.
Manually tested. The test requires to look at files,
which I think cannot be done portably with the test suite.
The test file is attached to the bug report.
2006-04-13 16:19:19 +02:00
holyfoot@deer.(none)
c2acfc5b7c
bug #15860 (SPATIAL keys in INNODB)
2006-04-12 22:05:23 +05:00
bar@mysql.com
e8e0d5c5fe
bug#17870 Table names conflict with Windows device names
...
It was impossible to create some table names on Windows
(e.g. LPT1, AUX, COM1, etc).
Fixed to pad dangerous names with thee "at" signs
(e.g. LPT1@@@, AUX@@@, COM1@@@, and so on).
2006-04-11 18:16:14 +05:00
marty@linux.site
950e258fde
Fixes for fast alter table for ndbcluster
2006-04-11 14:06:32 +02:00
ingo@mysql.com
c228bd4179
Merge mysql.com:/home/mydev/mysql-5.1-bug18477
...
into mysql.com:/home/mydev/mysql-5.1-aid
2006-04-06 08:40:38 +02:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
e94274f0cd
Fixes
2006-04-03 12:26:35 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
0a02cbb5f6
Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
2006-04-01 16:31:53 -05:00
mikron@c-2509e253.1238-1-64736c10.cust.bredbandsbolaget.se
635b0a9dc0
WL 2826: Error handling of ALTER TABLE for partitioning
...
More review fixes
2006-04-01 16:37:36 +02:00
igor@rurik.mysql.com
d6af1b6e39
Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-04-01 02:57:56 -08:00
reggie@linux.site
b05f270c1f
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into linux.site:/home/reggie/work/mysql-5.1-bug17631
2006-03-31 11:42:12 -06:00
reggie@linux.site
795659e775
cleaned up a few method comments
...
moved several functions from sql_partition to be member functions
2006-03-31 11:39:44 -06:00
gluh@mysql.com
486a48d46c
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-03-31 13:17:45 +05:00
ingo@mysql.com
7253099cf3
Bug#18477 - MySQL/InnoDB Ignoring Foreign Keys in ALTER TABLE
...
InnoDB requires a full table rebuild for foreign key changes.
It was not possible in compare_tables() to detect such changes.
On Heikkis proposal I added a new flag to the syntax parser
where foreign key definition changes are done. I test for
this flag in compare_tables() now.
2006-03-30 20:55:54 +02:00
evgen@sunlight.local
eb075f2255
Manual merge
2006-03-30 17:14:55 +04:00
evgen@sunlight.local
47f9b46564
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sunlight.local:/local_work/15560-bug-4.1-mysql
2006-03-30 10:22:03 +04:00
gluh@eagle.intranet.mysql.r18.ru
70a8f32d81
post-merge fix
2006-03-30 09:13:25 +05:00
gluh@mysql.com
ea56026e4f
Merge
2006-03-30 08:13:28 +05:00