mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-08 04:03:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34045 commits 2857 branches 349 tags 1.6 GiB
Commit graph

11850 commits

Author SHA1 Message Date
jani@a193-229-222-105.elisa-laajakaista.fi
414d5c0983 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2006-05-16 00:37:34 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
1b524d6b5f Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
 2006-05-15 21:33:47 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
3846438a9c Fix, or a workaround for Bug#19386 "Multiple alter causes crashed table" 
The problem is that in a MyISAM table the following column
after a varchar field gets corrupted, if varchar field is
extended.

This should be made to work without a copy in the future, but
I'm not sure if this code is ready yet. This fix will force copy
in this case. It will not do any harm to have it here, only makes
alter table a bit slower in this case. If this should work for
MyISAM, then the bug is somewhere else in that code.

Until it works, I propose this as a temporary fix or a workaround.
Test case for the bug has been added.
 2006-05-15 19:41:04 +03:00
sergefp@mysql.com
a70bfd6c69 Merge mysql.com:/home/psergey/tmp_merge3 
into  mysql.com:/home/psergey/mysql-5.1-merge2
 2006-05-13 22:40:26 +04:00
acurtis@xiphis.org
ff71980af7 fix binlog results 2006-05-13 01:09:00 -07:00
acurtis@xiphis.org
a84822afde fix partition test 2006-05-12 22:30:13 -07:00
acurtis@xiphis.org
4e2c63a7ba Merge bk-internal:/home/bk/mysql-5.1-new 
into  xiphis.org:/home/acurtis/mysql-5.1-merge
 2006-05-12 17:40:58 -07:00
ngrishakin@mysql.com
5caf8bc77b Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new
 2006-05-13 01:32:24 +02:00
ngrishakin@mysql.com
e4497ace5f .del-ndb_partition_range.result~17fc1db754d4153d: 
Delete: mysql-test/r/ndb_partition_range.result
.del-ndb_partition_list.result~7af68cd45e74abf:
  Delete: mysql-test/r/ndb_partition_list.result
.del-ndb_partition_key.result~68b9a59cff8c9840:
  Delete: mysql-test/r/ndb_partition_key.result
.del-ndb_partition_error.result~944f84894e323e9:
  Delete: mysql-test/r/ndb_partition_error.result
.del-ndb_blob_partition.result~fda88ddfc5477a7e:
  Delete: mysql-test/r/ndb_blob_partition.result
.del-ndb_partition_range.test~af8f9016b6648239:
  Delete: mysql-test/t/ndb_partition_range.test
.del-ndb_partition_list.test~940289b3d58595ca:
  Delete: mysql-test/t/ndb_partition_list.test
.del-ndb_partition_key.test~ed7b15c91f66558d:
  Delete: mysql-test/t/ndb_partition_key.test
.del-ndb_partition_error.test~2da477be29be041f:
  Delete: mysql-test/t/ndb_partition_error.test
.del-ndb_blob_partition.test~ea99ef9759705ce3:
  Delete: mysql-test/t/ndb_blob_partition.test
 2006-05-13 01:30:44 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
4bab3eed28 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
 2006-05-12 22:47:21 +03:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
ab63f5d072 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/bug19010
 2006-05-12 15:47:20 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
640a4de065 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19140 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 15:44:15 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
cb28572558 merge 2006-05-12 15:41:46 -04:00
acurtis@xiphis.org
1b8af703a3 fix results after merge 2006-05-12 11:49:35 -07:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c85be97f50 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/bug19010
 2006-05-12 12:22:31 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c558d9d00d Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19502 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 12:14:39 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
14bbe2c0ee Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19501 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 12:11:46 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
113cc95f84 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19062 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 12:09:26 -04:00
acurtis@xiphis.org
9ba0ac9579 manual merge bug#10952 2006-05-12 08:50:31 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
133f5dd6bf Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
 2006-05-12 16:47:43 +03:00
jmiller@mysql.com
e9056d856d Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-05-12 14:28:16 +02:00
jmiller@mysql.com
375473ed95 rpl_row_basic_11bugs.test, rpl_multi_engine.test, rpl_flsh_tbls.test: 
Updated per lars
rpl_row_flsh_tbls.test:
  updated per lars
 2006-05-12 14:09:13 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
dcd41ec846 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
 2006-05-12 13:37:56 +03:00
msvensson@neptunus.(none)
9f5c15cfa8 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-12 11:51:04 +02:00
aelkin@mysql.com
f7f83cd04c Bug#19728: Test mysqldump failure 
regex is fixed for windows.
 2006-05-12 12:32:44 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
9dffc3cd01 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
 2006-05-12 11:26:42 +03:00
msvensson@neptunus.(none)
47a578f4e4 Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-12 08:45:22 +02:00
jmiller@mysql.com
11d442a1c3 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-05-11 21:46:10 +02:00
sergefp@mysql.com
acdc038a44 Bug#19136: Manual 5.0->5.1 merge 2006-05-11 20:41:11 +04:00
jmiller@mysql.com
f1d1c98df6 changes for when NDB is default engine 2006-05-11 18:12:06 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
af922ea812 Removed duplicate test. 2006-05-11 19:06:36 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
e48db27c67 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
 2006-05-11 19:06:35 +03:00
sergefp@mysql.com
d2efab4d6f Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/psergey/mysql-5.1-merge5
 2006-05-11 20:06:34 +04:00
sergefp@mysql.com
22c71d3db8 Merge mysql.com:/home/psergey/tmp_merge 
into  mysql.com:/home/psergey/mysql-5.1-merge5
 2006-05-11 18:41:53 +04:00
jmiller@mysql.com
2efbd96b8e Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-05-11 13:46:43 +02:00
kroki@mysql.com
0499b30151 Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.1-merge
 2006-05-11 11:28:56 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
8a3d5e8f4f Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
 2006-05-11 04:20:07 +03:00
jmiller@mysql.com
79293053c4 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-05-11 01:41:39 +02:00
jmiller@mysql.com
2ef6dffebf rpl_log.test: 
Remove comments not needed
 2006-05-11 00:59:34 +02:00
jmiller@mysql.com
0ab18c91f4 rpl_log.test: 
Correct fix for test bug
2006-05-11 00:58:13 +02:00
msvensson@neptunus.(none)
14a6cacec4 Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-10 21:44:11 +02:00
msvensson@neptunus.(none)
41f1206b62 Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-10 21:38:48 +02:00
msvensson@neptunus.(none)
3b9891716c Add missing drop table 2006-05-10 21:35:05 +02:00
msvensson@neptunus.(none)
6420483d6b Update test results for 5.1 2006-05-10 20:39:26 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
56b97747de BUG#19010: Fix issues with that ALTER TABLE from auto-partitioned NDB table doesn't work unless primary key exists on table. 2006-05-10 12:53:40 -04:00
msvensson@neptunus.(none)
efea82bfba Update results to 5.1 format 2006-05-10 16:58:44 +02:00
msvensson@neptunus.(none)
4736d8d53c Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-10 15:49:33 +02:00
sergefp@mysql.com
2956dbe84f BUG#17379 Wrong reuse of E(#rows(range)) as E(#rows(ref(const))): 
Re-work best_access_path() and find_best() to reuse E(#rows(range access)) as
E(#rows(ref[_or_null](const) access) only when it is appropriate.
[This is the final cumulative patch]
 2006-05-10 17:40:20 +04:00
msvensson@neptunus.(none)
f5cbfceb93 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-10 09:21:58 +02:00
gkodinov@mysql.com
1efda1ea54 Merge mysql.com:/home/kgeorge/mysql/5.0/clean 
into  mysql.com:/home/kgeorge/mysql/5.0/B18068
 2006-05-10 09:38:40 +03:00