Commit graph

35331 commits

Author SHA1 Message Date
unknown
c92b025b3a BUG#17138: Crashes in stored procedure
Last round of review fixes


BUILD/compile-pentium-gcov:
  No change
sql/ha_ndbcluster.h:
  Last round of review changes
sql/ha_partition.h:
  Last round of review changes
sql/handler.h:
  Last round of review changes
sql/item_sum.cc:
  Last round of review changes
sql/sql_acl.cc:
  Last round of review changes
sql/sql_insert.cc:
  Last round of review changes
sql/sql_select.cc:
  Last round of review changes
sql/sql_table.cc:
  Last round of review changes
sql/sql_union.cc:
  Last round of review changes
sql/sql_update.cc:
  Last round of review changes
2006-07-01 00:01:37 -04:00
unknown
bf723783a7 Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug17138


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2006-06-22 10:27:41 -04:00
unknown
d65b4af29a BUG#17138: Stored procedure error
Review fixes


mysql-test/r/partition.result:
  Review fixes
mysql-test/t/partition.test:
  Review fixes
sql/sql_insert.cc:
  Fixed a bug
2006-06-22 10:01:30 -04:00
unknown
9ee380cbd3 Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug17138


sql/ha_ndbcluster.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2006-06-21 21:24:04 -04:00
unknown
5329154849 BUG#17138: Error in stored procedure
Review comments


mysql-test/t/partition.test:
  Changed procedure names ensured procedures were dropped
sql/ha_ndbcluster.h:
  Improved name of method
sql/ha_partition.h:
  Improved name of method
sql/handler.h:
  Improved name of method
  Removed deprecated constants
sql/item_sum.cc:
  Improved name of method
sql/sql_acl.cc:
  Improved name of method
sql/sql_insert.cc:
  Removed use of HA_WRITE_SKIP and introduced is_fatal_error instead
sql/sql_select.cc:
  Improved name of method
sql/sql_table.cc:
  Improved name of method
  Reintroduced dead code for future possible use
sql/sql_union.cc:
  Improved name of method
sql/sql_update.cc:
  Improved name of method
2006-06-21 20:55:33 -04:00
unknown
9939203277 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


mysql-test/r/partition_error.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
2006-06-22 01:25:57 +02:00
unknown
581d49d9bc Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug19281


sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2006-06-21 19:25:56 -04:00
unknown
33e3a59d23 mmanual merge 2006-06-21 19:08:30 -04:00
unknown
a8a6fdee39 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


mysql-test/r/show_check.result:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
2006-06-21 17:51:54 +02:00
unknown
59de9c42c4 Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug19281


sql/sql_insert.cc:
  Auto merged
2006-06-21 11:41:06 -04:00
unknown
767cb0b4a6 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18102
2006-06-21 17:19:59 +02:00
unknown
1cd8b43f9e ndb - add test_event_merge to daily-devel-tests.txt
storage/ndb/test/run-test/daily-devel-tests.txt:
  test_event_merge
2006-06-21 17:17:12 +02:00
unknown
2b5995479a BUG#19309: Problem with calling proecdures twice
Need to flag when a copy is needed to not overwrite a create_info
object connected to the lex structure


sql/mysql_priv.h:
  Need to flag when a copy is needed to not overwrite a create_info
  object connected to the lex structure
sql/sql_insert.cc:
  Need to flag when a copy is needed to not overwrite a create_info
  object connected to the lex structure
sql/sql_parse.cc:
  Need to flag when a copy is needed to not overwrite a create_info
  object connected to the lex structure
sql/sql_table.cc:
  Need to flag when a copy is needed to not overwrite a create_info
  object connected to the lex structure
2006-06-21 10:57:30 -04:00
unknown
5f0eba6f87 ndb - bug#18102: fixes on NDB API level
storage/ndb/test/ndbapi/test_event_merge.cpp:
  test multiple tables and getGCIEventOperations
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  fix getGCIEventOperations when merge events is on
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  fix getGCIEventOperations when merge events is on
2006-06-21 16:15:04 +02:00
unknown
238ca46573 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/usr/home/ram/work/mysql-5.1
2006-06-21 19:14:59 +05:00
unknown
79afa8ad53 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-21 15:33:22 +02:00
unknown
9a353ee195 After merge fix 2006-06-21 15:30:26 +02:00
unknown
d14f4cccf2 Fix for bug : rpl_ndb_log.test failure
mysql-test/extra/rpl_tests/rpl_log.test:
  Fix for bug : rpl_ndb_log.test failure
    - replace insignificant columns to make tests repeatable
mysql-test/r/rpl_ndb_log.result:
  Fix for bug : rpl_ndb_log.test failure
    - result adjusted
mysql-test/r/rpl_row_log.result:
  Fix for bug : rpl_ndb_log.test failure
    - result adjusted
mysql-test/r/rpl_row_log_innodb.result:
  Fix for bug : rpl_ndb_log.test failure
    - result adjusted
2006-06-21 18:16:07 +05:00
unknown
6bf7ada5c3 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


mysql-test/r/sql_mode.result:
  Auto merged
mysql-test/t/sql_mode.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
client/mysqldump.c:
  Manual merge
mysql-test/r/mysqldump.result:
  Manual merge
mysql-test/t/mysqldump.test:
  Manual merge
2006-06-21 14:14:37 +02:00
unknown
cffb1699bf Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


mysql-test/t/disabled.def:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2006-06-21 13:51:28 +02:00
unknown
ac67bfd7f7 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


sql/ha_ndbcluster.cc:
  Auto merged
2006-06-21 13:42:02 +02:00
unknown
a0e5d9daff Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/marty/MySQL/mysql-5.1
2006-06-21 12:02:03 +02:00
unknown
a61b58df44 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-21 12:02:02 +02:00
unknown
f4e2516a1a after merge fixes
mysql-test/r/partition_error.result:
  result fix
sql/log.cc:
  use open_slow_log() instead of open_query_log() for slow query log
sql/log.h:
  after merge fix
sql/set_var.cc:
  after merge fix
  use open_slow_log() instead of open_query_log() for slow query log
2006-06-21 14:53:40 +05:00
unknown
4ecc33a35f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/marty/MySQL/mysql-5.1
2006-06-21 10:10:01 +02:00
unknown
4891ddc977 Fixed failed automerge 2006-06-21 09:51:08 +02:00
unknown
a57fa1e2fe Disable IM tests. 2006-06-21 11:44:54 +04:00
unknown
c977e29c4e Merge mysql.com:/home/marty/MySQL/mysql-5.0-backed
into  mysql.com:/home/marty/MySQL/mysql-5.1


sql/ha_ndbcluster.h:
  Auto merged
mysql-test/r/ndb_replace.result:
  Merge
sql/ha_ndbcluster.cc:
  Merge
2006-06-21 09:42:15 +02:00
unknown
aedbb330c8 Fix for Bug REPLACE doesn't update TEXT fields correctly 2006-06-21 09:36:50 +02:00
unknown
ab0e66a82b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
2006-06-21 08:49:40 +02:00
unknown
fb074e3891 Re-enable IM tests. 2006-06-21 02:17:39 +04:00
unknown
a28e7eb420 Fix merge 5.0 -> 5.1.
mysql-test/r/im_life_cycle.result:
  Fix manual merge.
2006-06-21 02:16:38 +04:00
unknown
d1e45ad8f8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/alik/MySQL/devel/5.1-merged
2006-06-21 02:00:49 +04:00
unknown
9fc2ade279 Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug17138


sql/sql_update.cc:
  Auto merged
2006-06-20 16:59:51 -04:00
unknown
897810e961 BUG#17138: Crash in stored procedure after fatal error that wasn't a real fatal error
sql/handler.h:
  Handle HA_ERR_FOUND_DUPP_KEY and HA_ERR_FOUND_DUPP_UNIQUE similarly
sql/item_sum.cc:
  fix
sql/sql_select.cc:
  fix
2006-06-20 16:52:40 -04:00
unknown
73d86f3206 rpl_ndb_log.result:
Corrected test case result


mysql-test/r/rpl_ndb_log.result:
  Corrected test case result
2006-06-21 00:45:01 +04:00
unknown
68d4c991e1 Merge dator5.(none):/home/pappa/bug16000
into  dator5.(none):/home/pappa/bug19281


mysql-test/t/partition_mgm.test:
  Auto merged
2006-06-20 16:43:25 -04:00
unknown
ed7dd45ffc BUG#16000: .par file left behind plus unnecessary messages to error.log
New test cases


mysql-test/r/partition_error.result:
  New test cases
mysql-test/r/partition_mgm.result:
  New test cases
mysql-test/t/partition_error.test:
  New test cases
mysql-test/t/partition_mgm.test:
  New test cases
2006-06-20 16:38:42 -04:00
unknown
7f272a495f Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug16000
2006-06-20 16:07:55 -04:00
unknown
b5e4391142 Merge dator5.(none):/home/pappa/bug19309
into  dator5.(none):/home/pappa/bug19281
2006-06-20 15:18:16 -04:00
unknown
5efea6a0a0 Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug19309


sql/sql_table.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
2006-06-20 15:13:44 -04:00
unknown
d73b5b68df Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug19281
2006-06-20 15:09:48 -04:00
unknown
f2e7433826 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  manual merge
2006-06-20 19:33:25 +02:00
unknown
3d04972974 BUG#16000: .par file not removed plus errors to error log for normal errors
sql/table.cc:
  Remove error printouts when error occurs during open frm as part of
  CREATE/ALTER TABLE
sql/unireg.cc:
  Ensure .par file is removed after error
2006-06-20 13:24:30 -04:00
unknown
fa2673f119 Bug Fix error messages 2006-06-20 19:17:07 +02:00
unknown
c2620e1fab Bug Fix error messages 2006-06-20 19:13:46 +02:00
unknown
e26bcc2e6e Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-06-20 20:13:37 +04:00
unknown
6c2a6b47b0 rpl_ndb_log.result:
Fixed failing test case


mysql-test/r/rpl_ndb_log.result:
  Fixed failing test case
2006-06-20 20:11:08 +04:00
unknown
4ea947bf91 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


sql/mysqld.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
2006-06-20 18:06:22 +02:00
unknown
46845cf357 Merge mysql.com:/home/alik/MySQL/devel/5.0-to-be-merged
into  mysql.com:/home/alik/MySQL/devel/5.1-merged


BitKeeper/deleted/.del-im_life_cycle-im.opt:
  Delete: mysql-test/t/im_life_cycle-im.opt
BitKeeper/deleted/.del-im_utils-im.opt:
  Delete: mysql-test/t/im_utils-im.opt
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/r/im_utils.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/im_daemon_life_cycle-im.opt:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
server-tools/instance-manager/instance_map.cc:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Manually merged.
mysql-test/r/insert.result:
  Manually merged.
mysql-test/t/im_daemon_life_cycle.imtest:
  Manually merged.
mysql-test/t/im_life_cycle.imtest:
  Manually merged.
mysql-test/t/im_utils.imtest:
  Manually merged.
mysql-test/t/insert.test:
  Manually merged.
server-tools/instance-manager/guardian.cc:
  Manually merged.
server-tools/instance-manager/manager.cc:
  Manually merged.
sql/sql_insert.cc:
  Manually merged.
2006-06-20 18:28:28 +04:00