Commit graph

39234 commits

Author SHA1 Message Date
unknown
53b1792e17 ndb - bug#23494
Fix bug in restore with table with many columns, Compute size of databuffer pool correctly
2006-10-20 14:37:34 +02:00
unknown
d54d43b61c ndb -
Add better error message if getting error in RESTORE
2006-10-20 14:36:39 +02:00
unknown
4df13366fa ndb - bug#22838
when doing create unique index which mysql will silently converts to PK, ndb is not informed
    so table will be useless.
  
    change so that we never do online add index wo/ primary key.
    this is not good, but it's better than a useless table
2006-10-20 14:35:59 +02:00
unknown
8744989469 merge 2006-10-20 14:35:22 +02:00
unknown
30c8b7bd17 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2006-10-20 14:31:39 +02:00
unknown
c54295f703 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2006-10-20 13:38:49 +02:00
unknown
b81cc9c302 ndb -
Fixed a 4.1/5.0 vs. 5.1 name change in latest SR bug fix


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fixed a 4.1/5.0 vs. 5.1 name change in latest SR bug fix
2006-10-20 13:38:15 +02:00
unknown
8af997108c Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2006-10-20 12:31:51 +02:00
unknown
608e9207ef ndb -
Fix monster SR bug making SR with ordered indexes (or temporary tables) broken


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix monster SR bug making SR with ordered indexes (or temporary tables) broken
2006-10-20 12:29:16 +02:00
unknown
9852dfbcf5 Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt


mysql-test/r/myisam.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2006-10-20 11:15:54 +02:00
unknown
73baa90a07 Merge bk-internal:/home/bk/mysql-5.1
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt


mysql-test/r/myisam.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2006-10-20 11:12:35 +02:00
unknown
ab13365536 Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2006-10-20 11:05:06 +02:00
unknown
8cc480915f Merge bk-internal:/home/bk/mysql-5.0
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


mysql-test/r/myisam.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2006-10-20 11:02:56 +02:00
unknown
0153d67e59 Merge bk-internal:/home/bk/mysql-4.1
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt


sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2006-10-20 10:57:38 +02:00
unknown
951243708c sql_rename.cc, sql_table.cc, type_decimal.result, mix2_myisam.result:
merge fixes


mysql-test/r/mix2_myisam.result:
  merge fixes
mysql-test/r/type_decimal.result:
  merge fixes
sql/sql_rename.cc:
  merge fixes
sql/sql_table.cc:
  merge fixes
2006-10-20 10:12:38 +02:00
unknown
94f337bb4d After merge fix. 2006-10-19 20:29:12 +05:00
unknown
9a77a540aa Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines


mysql-test/t/repair.test:
  Auto merged
sql/sql_base.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
mysql-test/r/repair.result:
  Manual merge.
2006-10-19 19:59:57 +05:00
unknown
fcbf1509e2 Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt


BitKeeper/deleted/.del-bdb.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/group_min_max.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/group_min_max.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
include/my_base.h:
  SCCS merged
mysql-test/include/mix1.inc:
  SCCS merged
mysql-test/r/group_by.result:
  SCCS merged
mysql-test/r/innodb_mysql.result:
  SCCS merged
mysql-test/t/group_by.test:
  SCCS merged
sql/sql_select.cc:
  SCCS merged
2006-10-19 16:43:46 +02:00
unknown
f4f15b5435 Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/table.cc:
  Auto merged
2006-10-19 16:00:06 +02:00
unknown
7debdee89e Fix small glitch during parsing of ALTER EVENT xyz
with only COMMENT clause. Strangely it has manifestated itself
only on two platforms. This is a fix for bug#23423 
"Syntax error for "ALTER EVENT ... COMMENT ..." on just two platforms"


sql/sql_yacc.yy:
  if COMMENT is used mark it as used.
  There was a missing setting to 1 of $$. If COMMENT
  was used in combinations with other clauses then it
  was passing.
2006-10-19 15:56:37 +02:00
unknown
3ad2baa172 After merge fix. 2006-10-19 18:48:37 +05:00
unknown
230607a06b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-10-19 15:32:21 +02:00
unknown
6278dff88c Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-10-19 15:29:52 +02:00
unknown
3ee868c7b1 Bug #21072 Duplicate key error in NDB references wrong key: use MAX_KEY to signal unknown key: Added string initialization 2006-10-19 15:22:50 +02:00
unknown
8bcb2a951d Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/handler.cc:
  Using local
2006-10-19 15:15:03 +02:00
unknown
7753c52a92 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-10-19 15:08:10 +02:00
unknown
baacb8a13d Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines


myisam/sort.c:
  Auto merged
mysql-test/r/repair.result:
  Auto merged
mysql-test/t/repair.test:
  Auto merged
sql/sql_base.cc:
  Use local.
2006-10-19 18:04:34 +05:00
unknown
5e1fe0f800 Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


sql/sql_select.cc:
  Auto merged
mysql-test/r/olap.result:
  SCCS merged
2006-10-19 15:04:12 +02:00
unknown
822049b9e1 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0


sql/handler.cc:
  Auto merged
2006-10-19 15:00:46 +02:00
unknown
59c4b5ba20 Bug #21072 Duplicate key error in NDB references wrong key: use MAX_KEY to signal unknown key: Added string initialization 2006-10-19 14:57:04 +02:00
unknown
d30186772f Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


mysql-test/r/merge.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
2006-10-19 14:37:49 +02:00
unknown
2576c4c0c9 Merge mysql.com:/home/svoj/devel/mysql/BUG23175/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines


mysql-test/r/repair.result:
  Manual merge.
mysql-test/t/repair.test:
  Manual merge.
2006-10-19 17:35:09 +05:00
unknown
9bfaab57fa Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt


sql/sql_select.cc:
  Auto merged
2006-10-19 14:34:56 +02:00
unknown
f841b546b0 Merge mysql.com:/home/svoj/devel/mysql/BUG22562/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines
2006-10-19 17:33:22 +05:00
unknown
e873878ddb Merge chilla.local:/home/mydev/mysql-5.0-merge
into  chilla.local:/home/mydev/mysql-5.1-merge


sql/mysql_priv.h:
  Auto merged
2006-10-19 13:43:57 +02:00
unknown
862d8bab98 Bug#21476 - Lost Database Connection During Query
Backport from 5.1.
Raised STACK_MIN_SIZE for Debian GNU/Linux Sid,
Linux kernel 2.6.16,
gcc version 3.3.6 (Debian 1:3.3.6-13),
libc6-dbg 2.3.6.ds1-4,
Pentium4 (x86),
BUILD/compile-pentium-debug-max
Raised about 100 Bytes above the required minimum.
2006-10-19 13:42:26 +02:00
unknown
4681c06642 libmysqld/Makefile.am fixed
config/ac-macros/plugins.m4:
  code moved to the proper place
libmysqld/Makefile.am:
  "" removed
2006-10-19 16:39:24 +05:00
unknown
5dd4481daa Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-tux


storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  SCCS merged
storage/ndb/src/kernel/vm/DLFifoList.hpp:
  maybe already-done-merge
2006-10-19 12:29:24 +02:00
unknown
f0fb0d17c2 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
2006-10-19 11:23:34 +02:00
unknown
b8812c85db ndb - add temporary tables to hugo
and use it for testOperations/testTransactions


storage/ndb/test/include/NDBT_Test.hpp:
  Add support for temporary tables in hugo
storage/ndb/test/ndbapi/testOperations.cpp:
  Make testOperations use temporary tables
storage/ndb/test/ndbapi/testTransactions.cpp:
  Make testTransactions use temporary tables
storage/ndb/test/src/NDBT_Tables.cpp:
  Add support for temporary tables in hugo
storage/ndb/test/src/NDBT_Test.cpp:
  Add support for temporary tables in hugo
2006-10-19 11:20:04 +02:00
unknown
e4a398f1d3 ndb - bug#22672
fix another incorrect assertion


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  clear m_transaction_nodes.clear()
  to avoid asserion in debug-compiled in releaseApiCon
2006-10-19 11:18:04 +02:00
unknown
a1fa0ed49b ndb - fix incorrect assertion
Dont assert when getting gci=0 in read only transaction


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Dont assert when getting gci=0 in read only transaction
2006-10-19 10:43:25 +02:00
unknown
fdfabb82b0 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  merge
2006-10-19 10:29:52 +02:00
unknown
2a7ee79b6c Merge chilla.local:/home/mydev/mysql-5.0-merge
into  chilla.local:/home/mydev/mysql-5.1-merge


include/my_sys.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
2006-10-19 10:29:38 +02:00
unknown
8144eb5a76 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  chilla.local:/home/mydev/mysql-5.1-merge


include/my_sys.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2006-10-19 10:15:08 +02:00
unknown
0e5fee5d70 Merge chilla.local:/home/mydev/mysql-4.1-merge
into  chilla.local:/home/mydev/mysql-5.0-merge


include/my_sys.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2006-10-19 10:01:28 +02:00
unknown
554aaed352 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-merge


sql/sql_select.cc:
  Auto merged
2006-10-19 09:59:01 +02:00
unknown
a4a09cd2cd Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  chilla.local:/home/mydev/mysql-4.1-merge
2006-10-19 09:44:51 +02:00
unknown
6134c07258 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2006-10-19 09:38:37 +02:00
unknown
d262020f44 ndb - bug#23200
this changes lock taken during peek, to decrease likelyhood of transaction abort
  


sql/ha_ndbcluster.cc:
  use exclusive lock in peek, as peek is used just before insert/update
2006-10-19 09:27:58 +02:00