Commit graph

32031 commits

Author SHA1 Message Date
unknown
64b1745f59 Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-13 13:49:37 +01:00
unknown
6e05df484e ndb - bug#18026
incorrect handling of varsize primary key and charsets in tup-scan


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  put tracenr log in signal log instead...as out file gets very big...
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  PK needs to be normalized before computing hashvalue, otherwise lock-req will not find row,
    causing assertion in debug build, and inconsistency in release
2006-03-13 13:37:42 +01:00
unknown
a4801409cf ndb - bug#16669
put nrtrace in out file instead (debug compiled..)


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  put nrtrace in out file instead (debug compiled..)
2006-03-13 12:29:43 +01:00
unknown
5a07a0986b Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  xgeek.:C:/work/mysql-5.1-new
2006-03-13 05:20:00 -06:00
unknown
e9cf66a02d base:
Fixed problem where taocrypt was defined too early in the process


win/cmakefiles/base:
  Fixed problem where taocrypt was defined too early in the process
2006-03-13 05:17:23 -06:00
unknown
c20dcc6d41 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
2006-03-13 13:57:22 +03:00
unknown
aa451a0e07 BUG#15407: Crash if error in subpartition definition
mysql-test/r/partition.result:
  New test cases
mysql-test/t/partition.test:
  New test cases
sql/sql_yacc.yy:
  New error checks
2006-03-13 02:36:02 -08:00
unknown
f7b53da098 Merge shellback.(none):/home/msvensson/mysql/init_rm/my51-init_rm
into  shellback.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
2006-03-13 11:32:10 +01:00
unknown
38b40482f7 Merge shellback.(none):/home/msvensson/mysql/init_rm/my50-init_rm
into  shellback.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
2006-03-13 11:31:15 +01:00
unknown
9865f74f17 Remove also slave clusters data on restart after test failure
mysql-test/mysql-test-run.pl:
  Setup path the slave clusters data dir
  Remove slave clusters data dir on restart after test case failure
2006-03-13 11:30:16 +01:00
unknown
73fa8e3c50 Merge shellback.(none):/home/msvensson/mysql/init_rm/my50-init_rm
into  shellback.(none):/home/msvensson/mysql/init_rm/my51-init_rm


mysql-test/mysql-test-run.pl:
  Auto merged
2006-03-13 11:13:58 +01:00
unknown
9f4f77ab90 Remove printouts
mysql-test/mysql-test-run.pl:
  Remove extra printouts
2006-03-13 11:06:14 +01:00
unknown
940dd0ed2c Merge shellback.(none):/home/msvensson/mysql/init_rm/my50-init_rm
into  shellback.(none):/home/msvensson/mysql/init_rm/my51-init_rm


mysql-test/mysql-test-run.pl:
  Merge 5.0 -> 5.1
2006-03-13 10:36:41 +01:00
unknown
a7a2db66cc Make mysql-test-run.pl restore the db(s) to a known state before continuing after test case failure
mysql-test/mysql-test-run.pl:
  Take a snapshot of the data dirs just after all db's have been installed and usedthat snasphot to restore the db(s) to a known state after a test case has failed.
  Thus avoiding subsequent test cases to fail because of previous test failures.
2006-03-13 10:30:36 +01:00
unknown
4487b8538f Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-03-13 09:55:42 +01:00
unknown
9db5b7d4f5 changed test to make it predictable
sql/ha_ndbcluster_binlog.cc:
  removing non critical assert
2006-03-13 09:55:41 +01:00
unknown
e942172ed8 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/51-new


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-03-13 09:36:39 +01:00
unknown
142eb227d8 ndb - remove incorrect assertion
bug#17854, bug#18000


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  remove incorrect assertion
2006-03-13 09:19:24 +01:00
unknown
b8f8105692 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-03-13 09:05:26 +01:00
unknown
95d4bdc601 Test fix
mysql-test/t/rpl_ndb_dd_advance.test:
  remove drop and create of test db
mysql-test/r/rpl_ndb_dd_advance.result:
  update
2006-03-13 09:03:05 +01:00
unknown
e8be46556e Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin


sql/log.cc:
  Auto merged
2006-03-13 10:27:03 +03:00
unknown
3364f871d4 Merge zim.(none):/home/brian/mysql/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.1-new
2006-03-12 06:49:03 -08:00
unknown
e01fbd7246 ndb -
Dont put object file in list of SOURCES...causing really weird make dist problem


storage/ndb/src/kernel/vm/Makefile.am:
  Dont put object file in list of SOURCES...causing really weird make dist problem
2006-03-11 21:34:49 +01:00
unknown
a7f0dca436 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-11 19:39:56 +01:00
unknown
1ff3d3c9fc dict0dict.h, dict0dict.c, ha_innodb.cc:
Make inline dict_table_is_comp() visible to ha_innodb.c as innodb_dict_table_is_comp()


sql/ha_innodb.cc:
  Make inline dict_table_is_comp() visible to ha_innodb.c as innodb_dict_table_is_comp()
storage/innobase/dict/dict0dict.c:
  Make inline dict_table_is_comp() visible to ha_innodb.c as innodb_dict_table_is_comp()
storage/innobase/include/dict0dict.h:
  Make inline dict_table_is_comp() visible to ha_innodb.c as innodb_dict_table_is_comp()
2006-03-11 19:13:31 +01:00
unknown
786ca5b7d4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
2006-03-11 16:11:36 +01:00
unknown
e89870f16c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-11 15:55:19 +01:00
unknown
a4f610f55e wl#3023 clean up
- enabling some new tests
2006-03-11 15:52:38 +01:00
unknown
402ff5523e Ensure we discover also error in using subpartition parts in
non-subpartitioned tables in ALTER TABLE ADD/REORGANIZE PARTITION
2006-03-11 06:32:24 -08:00
unknown
29cd6ff642 BUG#15961: SUBPARTITION defined in non-subpartitioned table no error
Made sure that no subpartition stuff in non-subpartitioned table


mysql-test/r/partition.result:
  New test case
mysql-test/r/partition_mgm_err.result:
  Fixed bug in test case
mysql-test/t/partition.test:
  New test case
mysql-test/t/partition_mgm_err.test:
  Fixed bug in test case
sql/sql_partition.cc:
  Made sure that no subpartition stuff in non-subpartitioned table
2006-03-11 06:17:10 -08:00
unknown
56c24480a9 BUG#16370: Default subpartitioning not properly handled in conjunction
with ALTER TABLE ADD/REORGANIZE PARTITION
Ensure that default subpartitioning is removed when subpartitions
are defined in ADD/REORGANIZE PARTITION


mysql-test/r/partition.result:
  New test cases
mysql-test/t/partition.test:
  New test cases
sql/sql_partition.cc:
  Ensure that default subpartitioning is removed when subpartitions
  are defined in ADD/REORGANIZE PARTITION
2006-03-11 05:56:06 -08:00
unknown
88a59c5000 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.1
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
2006-03-11 10:55:36 +02:00
unknown
cfcc1dc666 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0.20-bug15101-sysdate
2006-03-11 10:47:25 +02:00
unknown
c2db8a7ffc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/ndb_binlog_ddl_multi.test:
  Auto merged
sql/rpl_injector.cc:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  manual merge
2006-03-11 07:26:58 +01:00
unknown
9376ec6336 ndb suma: added some VM_TRACE debug printouts for reposrtSubscribers 2006-03-11 07:14:36 +01:00
unknown
f1689477a4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
2006-03-11 07:02:08 +01:00
unknown
435e084481 wl#3023 ndb to return correct tables for initial table maps
+ removed extra binlog events generated by drop table schema ops to produce predictable test cases


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  ndb: dict use define for number of pages in table definition
2006-03-11 06:58:48 +01:00
unknown
a264a79eb7 Merge
mysql-test/lib/mtr_cases.pl:
  Auto merged
2006-03-11 01:53:30 +01:00
unknown
f15f85bb2f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-03-11 01:42:42 +01:00
unknown
0085230782 Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-bug14980
2006-03-10 22:32:37 +01:00
unknown
34e43cd3a9 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug14980
2006-03-10 22:28:50 +01:00
unknown
4ff0d1b646 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug14980
2006-03-10 22:24:13 +01:00
unknown
05ed81fe3d ndb -
Remove test dependancy of table order in backup


mysql-test/r/ndb_restore.result:
  Remove dependancy of table order in backup
mysql-test/t/ndb_restore.test:
  Remove dependancy of table order in backup
2006-03-10 21:43:50 +01:00
unknown
1b9b17c33e Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M51/mysql-5.1 2006-03-10 21:05:10 +01:00
unknown
2722db6dd4 Merge mysql.com:/M50/bug-15861-5.0 into mysql.com:/M50/mysql-5.0 2006-03-10 21:00:15 +01:00
unknown
f8e9e29ff2 Merge mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.0-tree
into  mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1-tree


client/mysqldump.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2006-03-10 22:37:38 +03:00
unknown
dafa39f1c4 Fix version of DEFINER-clause in mysqldump.
Now DEFINER-clause in stored routines is expected to appear
in 5.0.20 release, not in 5.0.19. as it was supposed before.


client/mysqldump.c:
  Fixing version.
mysql-test/r/mysqldump.result:
  Updated the result file.
2006-03-10 22:23:04 +03:00
unknown
695716e804 Manual merge from 5.0.19 to 5.1, affecting only the problem of bug#16144
ChangeSet@1.2053.37.11, 2006-03-04 23:04:48+03:00, konstantin@mysql.com
Null-merge as instructed there!


libmysql/libmysql.c:
  Null-merged from 5.0.19 to 5.1, as instructed in
  ChangeSet@1.2053.37.11, 2006-03-04 23:04:48+03:00, konstantin@mysql.com
tests/mysql_client_test.c:
  Null-merging from 5.0.19 to 5.1, as instructed in
  ChangeSet@1.2053.37.11, 2006-03-04 23:04:48+03:00, konstantin@mysql.com
2006-03-10 20:22:06 +01:00
unknown
da1507258f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/merge-5.0
2006-03-10 19:53:15 +01:00
unknown
e098024dcb Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/merge-5.0
libmysql/libmysql.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2006-03-10 19:47:21 +01:00