thek@kpdesk.mysql.com
070ff2ac72
Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498
...
into kpdesk.mysql.com:/home/thek/dev/bug17489/my51-bug17498
2006-12-14 13:53:13 +01:00
thek@kpdesk.mysql.com
7e60087441
Bug#17498 failed to put data file in custom directory use "data directory" option
...
Merged 4.1->5.0. Updated myisam.test
2006-12-14 13:45:17 +01:00
thek@kpdesk.mysql.com
c9622dfb0a
Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my41-bug17498
...
into kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498
2006-12-14 13:38:09 +01:00
thek@kpdesk.mysql.com
29f72a0ba1
Bug#17498 failed to put data file in custom directory use "data directory" option
...
- When this bug was corrected it changed the behavior
for data/index directory in the myisam test case.
- This patch moves the OS depending tests to a non-windows
test file.
2006-12-14 13:23:31 +01:00
Kristofer.Pettersson@naruto.
74108797b7
Merge naruto.:C:/cpp/bug17489/my51-bug17489
...
into naruto.:C:/cpp/mysql-5.1-maint
2006-12-11 13:22:47 +01:00
msvensson@neptunus.(none)
160a3dce64
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-11 11:28:11 +01:00
Kristofer.Pettersson@naruto.
81ec16b751
Merge naruto.:C:/cpp/bug17489/my50-bug17489
...
into naruto.:C:/cpp/bug17489/my51-bug17489
2006-12-10 17:01:27 +01:00
Kristofer.Pettersson@naruto.
57abd1dc1e
Merge naruto.:C:/cpp/bug17489/my41-bug17489
...
into naruto.:C:/cpp/bug17489/my50-bug17489
2006-12-10 16:40:15 +01:00
kaa@polly.local
d9dc018226
Merge polly.local:/tmp/maint/bug24261/my51-bug24261
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2006-12-08 23:47:49 +03:00
kaa@polly.local
6d1e7bcf7b
Merge polly.local:/tmp/maint/bug24261/my50-bug24261
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-12-08 22:38:03 +03:00
msvensson@neptunus.(none)
5817838c06
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-08 17:10:54 +01:00
msvensson@neptunus.(none)
cb903ec340
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-08 17:09:43 +01:00
msvensson@neptunus.(none)
9636ead18d
Bug#19410 Test 'kill' fails on Windows + SCO
2006-12-08 17:09:07 +01:00
kaa@polly.local
439ce0307b
Merge polly.local:/tmp/maint/bug24261/my50-bug24261
...
into polly.local:/tmp/maint/bug24261/my51-bug24261
2006-12-08 16:02:42 +03:00
msvensson@neptunus.(none)
8b6e5d4dfa
Backport fix for mysqladmin on windows test failure
2006-12-08 13:37:40 +01:00
Kristofer.Pettersson@naruto.
ecbb4eb987
Bug#17498 failed to put data file in custom directory use "data directory" option
...
- Using DATA/INDEX DIRECTORY option on Windows put data/index file into
default directory because the OS doesn't support readlink().
- The procedure for changing data/index file directory is
different under Windows.
- With this fix we report a warning if DATA/INDEX option is used,
but OS doesn't support readlink().
2006-12-07 17:01:00 +01:00
andrey@example.com
c24381bdaa
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into example.com:/work/mysql-5.1-maint
2006-12-07 13:58:56 +01:00
andrey@example.com
12a68db3d3
Additional fix for bug#22369
2006-12-07 13:57:39 +01:00
msvensson@neptunus.(none)
961275a356
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-06 23:45:09 +01:00
msvensson@neptunus.(none)
8022e9fcce
Adjust replace to mask win paths
2006-12-06 16:44:31 +01:00
msvensson@neptunus.(none)
7cb305ca77
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-05 19:56:49 +01:00
msvensson@neptunus.(none)
ea49384d2e
mysql.binlog_index renamed to mysql.ndb_binlog_index
2006-12-05 11:27:51 +01:00
msvensson@neptunus.(none)
58baec3f76
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-05 11:18:00 +01:00
msvensson@neptunus.(none)
23a059b224
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-05 10:54:17 +01:00
mskold/marty@mysql.com/linux.site
f8bd5d312b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-12-05 06:38:08 +01:00
andrey@example.com
6fd50a5ff6
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into example.com:/work/bug22369-v2/my51
2006-12-05 00:31:23 +01:00
thek@kpdesk.mysql.com
57f78d4ddc
Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint
...
into kpdesk.mysql.com:/home/thek/dev/tmp/mysql-5.0-maint
2006-12-04 23:51:54 +01:00
Kristofer.Pettersson@naruto.
9036b003d6
Merge kpettersson@bk-internal:/home/bk/mysql-5.1-new-maint
...
into naruto.:C:/cpp/mysql-5.1-maint
2006-12-04 22:55:44 +01:00
Kristofer.Pettersson@naruto.
6c4c315210
Disabled testcase flush2 until pushbild framework can handle test which
...
disables binlog.
2006-12-04 22:51:52 +01:00
thek@kpdesk.mysql.com
05410c7db8
Disabled flush2 until pushbuild framework can handle test which
...
disables binlog.
2006-12-04 22:46:12 +01:00
andrey@example.com
05f61b2493
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into example.com:/work/bug22369-v2/my51
2006-12-04 22:40:51 +01:00
iggy@rolltop.ignatz42.dyndns.org
e0eed3a34b
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
2006-12-04 15:33:53 -05:00
iggy@rolltop.ignatz42.dyndns.org
f427935804
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-12-04 15:32:16 -05:00
iggy@rolltop.ignatz42.dyndns.org
50222ce9ff
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
2006-12-04 15:30:55 -05:00
msvensson@neptunus.(none)
128b73fc36
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-04 19:28:38 +01:00
msvensson@neptunus.(none)
971c783f7d
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-04 19:11:55 +01:00
msvensson@neptunus.(none)
db3a21e75b
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-04 19:08:52 +01:00
msvensson@neptunus.(none)
33c248eee5
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-04 19:06:42 +01:00
msvensson@neptunus.(none)
a9f4f4ed11
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-04 19:01:31 +01:00
iggy@rolltop.ignatz42.dyndns.org
011b090c62
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836
2006-12-04 12:51:26 -05:00
andrey@example.com
44656a234c
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into example.com:/work/bug22369-v2/my51
2006-12-04 18:31:24 +01:00
andrey@example.com
e6a4727779
Fix for bug#22369: Alter table rename combined
...
with other alterations causes lost tables
Using RENAME clause combined with other clauses of ALTER TABLE led to
data loss (the data was there but not accessible). This could happen if the
changes do not change the table much. Adding and droppping of fields and
indices was safe. Renaming a column with MODIFY or CHANGE was unsafe operation,
if the actual column didn't change (changing from int to int, which is a noop)
Depending on the storage engine (SE) the behavior is different:
1)MyISAM/MEMORY - the ALTER TABLE statement completes
without any error but next SELECT against the new table fails.
2)InnoDB (and every other transactional table) - The ALTER TABLE statement
fails. There are the the following files in the db dir -
`new_table_name.frm` and a temporary table's frm. If the SE is file
based, then the data and index files will be present but with the old
names. What happens is that for InnoDB the table is not renamed in the
internal DDIC.
Fixed by adding additional call to mysql_rename_table() method, which should
not include FRM file rename, because it has been already done during file
names juggling.
2006-12-04 18:22:38 +01:00
gkodinov@dl145s.mysql.com
ddf219d21a
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1
2006-12-04 18:08:50 +01:00
gkodinov@dl145s.mysql.com
d253588c69
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0
2006-12-04 18:05:42 +01:00
mskold/marty@mysql.com/linux.site
6e8f99d29b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-12-04 15:09:47 +01:00
Kristofer.Pettersson@naruto.
f91e48c762
Merge naruto.:C:/cpp/bug17733/my50-bug17733
...
into naruto.:C:/cpp/mysql-5.0-maint
2006-12-04 14:43:34 +01:00
Kristofer.Pettersson@naruto.
be5da5a152
Merge naruto.:C:/cpp/bug17733/my51-bug17733
...
into naruto.:C:/cpp/mysql-5.1-maint
2006-12-04 14:34:56 +01:00
gkodinov/kgeorge@macbook.gmz
063fe51c69
item_func.cc:
...
fixed a valgrind warning
type_varchar.test:
fixed a valgrind warning
2006-12-04 14:26:05 +02:00
malff/marcsql@weblab.(none)
6e3f6b049b
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-maint-24736
2006-12-02 11:54:18 -07:00
andrey@example.com
32dedbe62d
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into example.com:/work/bug24395-v2/my51
2006-12-02 15:18:51 +01:00