Commit graph

4103 commits

Author SHA1 Message Date
unknown
bec076f494 Bug#30907
"Regression: "--innodb_autoinc_lock_mode=0" (off) not same as older releases"
Bug#28430
  "Failure in replication of innodb partitioned tables on row/mixed format"
Bug#30888
  "Innodb table + stored procedure + row deletion = server crash"

  Apply Oracle patch from Sunny
  Include tests cases by Omer
  Ensure that innobase_read_and_init_auto performs table autoinc lock when lock_mode = 0
  No need for "if" guard around row_unlock_table_autoinc_for_mysql() because
  it already performs same check.
  Make autoinc_lock_mode variable read-only for duration of running mysqld process.


storage/innobase/handler/ha_innodb.cc:
  Bug30907/28430
    "Regression: "--innodb_autoinc_lock_mode=0" (off) not same as older releases"
    "Failure in replication of innodb partitioned tables on row/mixed format"
    Apply Oracle patch from Sunny
    Ensure that innobase_read_and_init_auto performs table autoinc lock when lock_mode = 0
    No need for "if" guard around row_unlock_table_autoinc_for_mysql() because
    it already performs same check.
    Make autoinc_lock_mode variable read-only for duration of running mysqld process.
storage/innobase/row/row0sel.c:
  Bug30888
    "Innodb table + stored procedure + row deletion = server crash"
  
    Remove endian-specific code.
    Fix function row_search_autoinc_read_column() to handle any integer size up to 8 bytes.
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
  New BitKeeper file ``mysql-test/suite/rpl/r/rpl_innodb_bug28430.result''
mysql-test/suite/rpl/r/rpl_innodb_bug30888.result:
  New BitKeeper file ``mysql-test/suite/rpl/r/rpl_innodb_bug30888.result''
mysql-test/suite/rpl/t/rpl_innodb-master.opt:
  New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb-master.opt''
mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt:
  New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt''
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
  New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug28430.test''
mysql-test/suite/rpl/t/rpl_innodb_bug30888.test:
  New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug30888.test''
2007-09-08 11:19:35 -07:00
unknown
4b2606f382 replaced '--exec rm' to '--remove_file' 2007-09-07 12:04:57 +04:00
unknown
5fb2bdd719 Modifications to funcs_1 files for 5.1.22rc release including:
- Updated row help count information
 - Added missing 'order by' clauses (altrady fixed in build tree)
 - Fixed isses with ndb_storeproc06/10 tests (added use database)
 - Corrected use of wrong engine in ndb tests (already fixed in build tree)
 - Update to ndb__datadict to replect additional fields in I_S (already corrected in build tree)


mysql-test/suite/funcs_1/include/ndb_tb2.inc:
  Correction of wrong engine used for ndb test
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Updated result file
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
  Updated result file
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Updated result file
mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated result file
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated result file
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
  Updated result file
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Updated result file
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated result file
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated result file
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
  Updated result file
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Updated result file
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated result file
mysql-test/suite/funcs_1/r/ndb__datadict.result:
  Updated result file
mysql-test/suite/funcs_1/r/ndb_cursors.result:
  Updated result file
mysql-test/suite/funcs_1/r/ndb_func_view.result:
  Updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_06.result:
  Updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_07.result:
  Updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_08.result:
  Updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_10.result:
  Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
  Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_03.result:
  Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
  Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
  Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
  Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_09.result:
  Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
  Updated result file
mysql-test/suite/funcs_1/r/ndb_views.result:
  Updated result file
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
  Updated test file enforcing 'use database' after connect
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
  Updated test file enforcing 'use database' after connect
mysql-test/suite/funcs_1/views/views_master.inc:
  Adding order by clauses in missing places
2007-09-06 22:03:07 -07:00
unknown
0e1cdf8d94 Test cleanup in rpl_binlog_grant: XID values are unpredictable 2007-09-06 12:06:22 -06:00
unknown
e763095f6b Merge gleb.loc:/home/uchum/work/bk/5.1
into  gleb.loc:/home/uchum/work/bk/5.1-opt


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
2007-09-06 22:31:25 +05:00
unknown
91f14cdb2b moving these tests to suite ndb_team
mysql-test/suite/ndb_team/t/ndb_autodiscover2-master.opt:
  Rename: mysql-test/suite/ndb/t/ndb_autodiscover2-master.opt -> mysql-test/suite/ndb_team/t/ndb_autodiscover2-master.opt
mysql-test/suite/ndb_team/t/ndb_autodiscover2.test:
  Rename: mysql-test/suite/ndb/t/ndb_autodiscover2.test -> mysql-test/suite/ndb_team/t/ndb_autodiscover2.test
mysql-test/suite/ndb_team/t/ndb_autodiscover.test:
  Rename: mysql-test/suite/ndb/t/ndb_autodiscover.test -> mysql-test/suite/ndb_team/t/ndb_autodiscover.test
mysql-test/suite/ndb_team/t/ndb_autodiscover3.test:
  Rename: mysql-test/suite/ndb/t/ndb_autodiscover3.test -> mysql-test/suite/ndb_team/t/ndb_autodiscover3.test
mysql-test/suite/ndb_team/r/ndb_autodiscover.result:
  Rename: mysql-test/suite/ndb/r/ndb_autodiscover.result -> mysql-test/suite/ndb_team/r/ndb_autodiscover.result
mysql-test/suite/ndb_team/r/ndb_autodiscover2.result:
  Rename: mysql-test/suite/ndb/r/ndb_autodiscover2.result -> mysql-test/suite/ndb_team/r/ndb_autodiscover2.result
mysql-test/suite/ndb_team/r/ndb_autodiscover3.result:
  Rename: mysql-test/suite/ndb/r/ndb_autodiscover3.result -> mysql-test/suite/ndb_team/r/ndb_autodiscover3.result
mysql-test/suite/ndb_team/t/disabled.def:
  BitKeeper file /home/tomas/mysql-5.1-new-ndb/mysql-test/suite/ndb_team/t/disabled.def
2007-09-05 19:13:36 +02:00
unknown
4a3825c4de tests actually work in statement based 2007-09-05 18:44:47 +02:00
unknown
cd2450a163 correct include file 2007-09-05 17:31:26 +02:00
unknown
9462359eba BUG#27543 Backup and restore can compatible with different endians for blob attribute
mysql-test/Makefile.am:
  Add install data for new test case
storage/ndb/tools/restore/Restore.cpp:
  Convert blob(text) length stored in main table
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.2.Data:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.ctl:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.log:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.ctl:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.log:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.1.Data:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.ctl:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.log:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.ctl:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.log:
  test data for endian test
mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result:
  test result for endian test
mysql-test/suite/ndb/t/ndb_restore_different_endian_data.test:
  test case for endian test
2007-09-05 13:01:30 +00:00
unknown
5231a4d90b Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-09-04 22:25:23 +02:00
unknown
c458f7f6a3 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/rpl_utility.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
2007-09-04 12:25:54 -06:00
unknown
9d109fdef2 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/field.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/rpl_record.cc:
  Auto merged
sql/rpl_utility.cc:
  Auto merged
sql/rpl_utility.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
2007-09-04 19:49:42 +02:00
unknown
0e466b540c Disabling rpl_ndb_2other test.
mysql-test/suite/rpl_ndb/t/disabled.def:
  The rpl_ndb_2other test must be disabled until replication correctly
  handles endianess issues.
2007-09-04 15:24:04 +02:00
unknown
81dff1351a Rewrite test case for BUG 25843 to avoid SHOW BINLOG EVENTS
statement.


mysql-test/suite/rpl/r/rpl_ps.result:
  Update result file.
2007-09-03 15:13:34 +04:00
unknown
24539770c2 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-09-03 11:13:44 +02:00
unknown
d7463b5e1b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  ibm.opbmk:/home/alik/Documents/MySQL/devel/5.1-rt-bug25843


sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
2007-08-31 22:13:27 +04:00
unknown
7e0ad09edf Fix for BUG#25843: changing default database between PREPARE and EXECUTE
of statement breaks binlog.

There were two problems discovered by this bug:

  1. Default (current) database is not fixed at the creation time.
     That leads to wrong output of DATABASE() function.

  2. Database attributes (@@collation_database) are not fixed at
     the creation time. That leads to wrong resultset.

Binlog breakage and Query Cache wrong output happened because of
the first problem.

The fix is to remember the current database at the PREPARE-time and
set it each time at EXECUTE.


mysql-test/include/query_cache_sql_prepare.inc:
  The first part of the test case for BUG#25843.
mysql-test/r/query_cache_ps_no_prot.result:
  Update result file.
mysql-test/r/query_cache_ps_ps_prot.result:
  Update result file.
mysql-test/suite/rpl/r/rpl_ps.result:
  Update result file.
mysql-test/suite/rpl/t/rpl_ps.test:
  The second part of the test case for BUG#25843.
sql/mysql_priv.h:
  Added mysql_opt_change_db() prototype.
sql/sp.cc:
  1. Polishing;
  2. sp_use_new_db() has been removed;
  3. Use mysql_opt_change_db() instead of sp_use_new_db().
sql/sp.h:
  sp_use_new_db() has been removed.
  This function has nothing to do with a) sp and b) *new* database.
  It was merely "switch the current database if needed".
sql/sp_head.cc:
  1. Polishing.
  2. Use mysql_opt_change_db() instead of sp_use_new_db().
sql/sql_class.cc:
  Move THD::{db, db_length} into Statement.
sql/sql_class.h:
  Move THD::{db, db_length} into Statement.
sql/sql_db.cc:
  Introduce mysql_opt_change_db() as a replacement (and inspired by)
  sp_use_new_db().
sql/sql_prepare.cc:
  1. Remember the current database in Prepared_statement::prepare().
  2. Switch/restore the current database in Prepared_statement::execute().
2007-08-31 20:42:14 +04:00
unknown
66baabd408 Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-30 14:56:24 -06:00
unknown
cebc1abcc3 Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-30 14:54:19 -06:00
unknown
7de80833d9 Disable rpl_ndb_2other, which has never worked on bigendian machines. 2007-08-30 14:13:05 -06:00
unknown
89d3d58511 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge


client/mysql.cc:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2007-08-30 13:23:59 -06:00
unknown
2e081a2d8b Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge


mysql-test/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
mysql-test/suite/ndb/r/ndb_restore_compat.result:
  Auto merged
mysql-test/suite/ndb/t/ndb_restore_compat.test:
  Auto merged
2007-08-30 16:17:32 +08:00
unknown
ad49aa0649 Merge bk-internal:/home/bk/mysql-5.1-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-30 07:25:18 +02:00
unknown
674f49f8f4 Added ORDER BY to udf select so that results are ordered.
mysql-test/include/rpl_udf.inc:
  ORDER BY to force order
mysql-test/suite/rpl/r/rpl_udf.result:
  Fix for ORDER BY
2007-08-29 14:36:08 -07:00
unknown
48193af489 Merge sita.local:/Users/tsmith/m/bk/maint/51-target22
into  sita.local:/Users/tsmith/m/bk/maint/51


sql/field.cc:
  Auto merged
sql/log_event_old.cc:
  Auto merged
sql/rpl_record.h:
  Auto merged
sql/rpl_utility.cc:
  Auto merged
sql/rpl_utility.h:
  Auto merged
sql/slave.h:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
sql/log_event.cc:
  Manual merge
sql/log_event.h:
  Manual merge
sql/log_event_old.h:
  Manual merge
sql/rpl_record.cc:
  Manual merge
sql/slave.cc:
  Manual merge
2007-08-29 15:28:38 -06:00
unknown
26aadd2175 Bug#21975 Grant and revoke statements are non-transactional
Bug#21422 GRANT/REVOKE possible inside stored function, probably in a trigger
Bug#17244 GRANT gives strange error message when used in a stored function

GRANT/REVOKE statements are non-transactional (no explicit transaction
boundaries) in nature and hence are forbidden inside stored functions and
triggers, but they weren't being effectively forbidden. Furthermore, the
absence of implict commits makes changes made by GRANT/REVOKE statements to
not be rolled back.

The implemented fix is to issue a implicit commit with every GRANT/REVOKE
statement, effectively prohibiting these statements in stored functions
and triggers. The implicit commit also fixes the replication bug, and looks
like being in concert with the behavior of DDL and administrative statements.

Since this is a incompatible change, the following sentence should be
added to the Manual in the very end of the 3rd paragraph, subclause
13.4.3 "Statements That Cause an Implicit Commit": "Beginning with
MySQL 5.0.??, the GRANT and REVOKE statements cause an implicit commit."

Patch contributed by Vladimir Shebordaev


mysql-test/r/sp-error.result:
  Test case result for Bug#17244
mysql-test/t/sp-error.test:
  Test case for Bug#17244
sql/sp_head.cc:
  Set that a procedure with GRANT/REVOKE command has a (implicit or explicit)
  commit.
sql/sql_parse.cc:
  End active transaction in SQLCOM_GRANT and SQLCOM_REVOKE, and thus effectively
  prohibit these statements in stored functions and triggers. An implicit commit
  also fixes a bug in replication, when GRANT or REVOKE would disappear from the
  binary log in case of a subsequent ROLLBACK, since they were considered
  transactional statements.
mysql-test/suite/rpl/r/rpl_binlog_grant.result:
  Add test case result for Bug#21975
mysql-test/suite/rpl/t/rpl_binlog_grant.test:
  Add test case for Bug#21975
2007-08-29 16:59:38 -03:00
unknown
f5536380a3 Post merge fix 2 for
ChangeSet@1.2509, 2007-08-28
     http://lists.mysql.com/commits/33239
  Fixes for the funcs_1 datadict test bugs
  #30418 "datadict" tests (all engines) fail:
         Dependency on the host name for ordering
  #30420 "datadict" tests (all engines) fail:
         Release build has help tables loaded
  #30438 "{memory,myisam,ndb}__datadict" tests fail:
         Use "InnoDB" without checking
  #30440 "datadict" tests (all engines) fail:
         Character sets depend on
                   configuration


mysql-test/suite/funcs_1/README.txt:
  Improved README
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Additions for the NDB variant (currently not in use)
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Write a comment about Bug#30689 into the test protocols.
mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
  Fix for a not reported bug.
  The missing revoke usage and drop user harmed the next test.
mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result:
  Updated results
mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Updated results
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb__datadict.result:
  Updated results as far as they could be corrected.
  Attention:
     This test failed even before the current bug fixes.
     The updated expected results are now better than before,
     but they do not prevent that the test fails.
     It looks like one script is "damaged" and treats
     this NDB test different than expected within the
     file with expected results.
2007-08-29 21:36:45 +02:00
unknown
b201a6c7ac Move instance manager tests to it's own suite
mysql-test/suite/im/t/im_daemon_life_cycle-im.opt:
  Rename: mysql-test/t/im_daemon_life_cycle-im.opt -> mysql-test/suite/im/t/im_daemon_life_cycle-im.opt
mysql-test/suite/im/t/im_instance_conf-im.opt:
  Rename: mysql-test/t/im_instance_conf-im.opt -> mysql-test/suite/im/t/im_instance_conf-im.opt
mysql-test/suite/im/t/im_life_cycle-im.opt:
  Rename: mysql-test/t/im_life_cycle-im.opt -> mysql-test/suite/im/t/im_life_cycle-im.opt
mysql-test/suite/im/t/im_options-im.opt:
  Rename: mysql-test/t/im_options-im.opt -> mysql-test/suite/im/t/im_options-im.opt
mysql-test/suite/im/t/im_utils-im.opt:
  Rename: mysql-test/t/im_utils-im.opt -> mysql-test/suite/im/t/im_utils-im.opt
mysql-test/suite/im/r/im_cmd_line.result:
  Rename: mysql-test/r/im_cmd_line.result -> mysql-test/suite/im/r/im_cmd_line.result
mysql-test/suite/im/r/im_daemon_life_cycle.result:
  Rename: mysql-test/r/im_daemon_life_cycle.result -> mysql-test/suite/im/r/im_daemon_life_cycle.result
mysql-test/suite/im/r/im_instance_conf.result:
  Rename: mysql-test/r/im_instance_conf.result -> mysql-test/suite/im/r/im_instance_conf.result
mysql-test/suite/im/r/im_life_cycle.result:
  Rename: mysql-test/r/im_life_cycle.result -> mysql-test/suite/im/r/im_life_cycle.result
mysql-test/suite/im/r/im_options.result:
  Rename: mysql-test/r/im_options.result -> mysql-test/suite/im/r/im_options.result
mysql-test/suite/im/r/im_utils.result:
  Rename: mysql-test/r/im_utils.result -> mysql-test/suite/im/r/im_utils.result
mysql-test/suite/im/t/utils.sh:
  Rename: mysql-test/t/utils.sh -> mysql-test/suite/im/t/utils.sh
mysql-test/suite/im/t/wait_for_process.sh:
  Rename: mysql-test/t/wait_for_process.sh -> mysql-test/suite/im/t/wait_for_process.sh
mysql-test/suite/im/t/wait_for_socket.sh:
  Rename: mysql-test/t/wait_for_socket.sh -> mysql-test/suite/im/t/wait_for_socket.sh
mysql-test/suite/im/t/log.sh:
  Rename: mysql-test/t/log.sh -> mysql-test/suite/im/t/log.sh
mysql-test/suite/im/t/kill_n_check.sh:
  Rename: mysql-test/t/kill_n_check.sh -> mysql-test/suite/im/t/kill_n_check.sh
mysql-test/suite/im/t/im_check_env.inc:
  Rename: mysql-test/include/im_check_env.inc -> mysql-test/suite/im/t/im_check_env.inc
mysql-test/suite/im/t/im_cmd_line.imtest:
  Update location of im_check_env.inc
mysql-test/suite/im/t/im_daemon_life_cycle.imtest:
  Update location of im_check_env.inc
  Add variable UTIL that points to the "ugly" .sh scripts
mysql-test/suite/im/t/im_instance_conf.imtest:
  Update location of im_check_env.inc
mysql-test/suite/im/t/im_life_cycle.imtest:
  Update location of im_check_env.inc
  Add variable UTIL that points to the "ugly" .sh scripts
mysql-test/suite/im/t/im_options.imtest:
  Update location of im_check_env.inc
mysql-test/suite/im/t/im_utils.imtest:
  Update location of im_check_env.inc
  Add variable UTIL that points to the "ugly" .sh scripts
mysql-test/t/disabled.def:
  Move disabled im test to suite/im/t/disabled.def
mysql-test/suite/im/t/disabled.def:
  New BitKeeper file ``mysql-test/suite/im/t/disabled.def''
2007-08-29 19:02:33 +02:00
unknown
40aaeeea52 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B30244-5.1-opt


sql/item_create.cc:
  Auto merged
2007-08-29 16:32:26 +03:00
unknown
385ef618e8 Bug #30244: row_count/found_rows does not replicate well
The functions ROW_COUNT/FOUND_ROWS are indeed not safe to be used in 
 statement based replication.
 Added code to declare them as such and switch the statement they're in
 to row based logging for mixed mode.


sql/item_create.cc:
  Bug #30244: row_count/found_rows does not replicate well
   - add the functions to the set of "unsafe functions" 
     for statement based replication
mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result:
  BitKeeper file /home/kgeorge/mysql/work/B30244-5.1-opt/mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result
mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test:
  BitKeeper file /home/kgeorge/mysql/work/B30244-5.1-opt/mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test
2007-08-29 14:54:32 +03:00
unknown
3a4ee96a2c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


sql/field.cc:
  Auto merged
2007-08-29 12:51:25 +02:00
unknown
d27ec7a5e7 Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
- reverting patch as there where unknows sideeffects that we do not have time to follow up on just now
2007-08-29 09:44:37 +02:00
unknown
57f6076a64 Post merge fix 1 for
ChangeSet@1.2509, 2007-08-28
   http://lists.mysql.com/commits/33239
Fixes for the funcs_1 datadict test bugs
#30418 "datadict" tests (all engines) fail:
       Dependency on the host name for ordering
#30420 "datadict" tests (all engines) fail:
       Release build has help tables loaded
#30438 "{memory,myisam,ndb}__datadict" tests fail:
       Use "InnoDB" without checking
#30440 "datadict" tests (all engines) fail:
       Character sets depend on
                 configuration
There are more post merge fixes needed.


mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Post merge fix for
     ChangeSet@1.2509, 2007-08-28
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated results
mysql-test/suite/funcs_1/t/ndb__datadict.test:
  Adjusted script
2007-08-28 20:59:40 +02:00
unknown
8370bb3433 Merge four.local.lan:/WORK2/merge/mysql-5.0-build-datadict
into  four.local.lan:/WORK2/merge/mysql-5.1-build-datadict

It is to be expected that a post merge fix is needed.


mysql-test/suite/funcs_1/README.txt:
  Auto merged
mysql-test/suite/funcs_1/t/innodb__datadict.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory__datadict.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam__datadict.test:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Manual merge
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Manual merge
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Manual merge
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Manual merge
2007-08-28 19:41:14 +02:00
unknown
8c1e206971 Fixes for
Bug#30418 "datadict" tests (all engines) fail: Dependency on the host name
                for ordering
     Bug#30420 "datadict" tests (all engines) fail: Release build has help tables loaded
     Bug#30438 "{memory,myisam,ndb}__datadict" tests fail: Use "InnoDB" without checking
     Bug#30440 "datadict" tests (all engines) fail: Character sets depend on configuration
Attention: Only the build team can check if Bug#30440 is really fixed.


mysql-test/suite/funcs_1/README.txt:
  Update README
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  1. Exclude the help tables from the INFORMATION_SCHEMA.TABLES
     and the INFORMATION_SCHEMA.STATISTICS selects.
  2. Replace error numbers with error names
  3. Sort some results with mysqltest builtin function
  4. Some other minor changes
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Updated expected results
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated expected results
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated expected results
mysql-test/suite/funcs_1/t/innodb__datadict.test:
  Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.
mysql-test/suite/funcs_1/t/memory__datadict.test:
  Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.
mysql-test/suite/funcs_1/t/myisam__datadict.test:
  Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.
mysql-test/suite/funcs_1/r/datadict_help_tables_build.result:
  File with expected results
mysql-test/suite/funcs_1/r/datadict_help_tables_dev.result:
  File with expected results
mysql-test/suite/funcs_1/t/datadict_help_tables_build.test:
  Additional test checking the information about the help tables within
         INFORMATION_SCHEMA.TABLES/INFORMATION_SCHEMA.STATISTICS
  as compensation for the removed checks within datadict_master.inc.
  Variant for use during build tests (non empty help tables)
mysql-test/suite/funcs_1/t/datadict_help_tables_dev.test:
  Additional test checking the information about the help tables within
         INFORMATION_SCHEMA.TABLES/INFORMATION_SCHEMA.STATISTICS
  as compensation for the removed checks within datadict_master.inc.
  Variant for use during development tests (empty help tables)
2007-08-28 18:37:17 +02:00
unknown
90b5cbb088 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


mysql-test/suite/ndb/r/ndb_restore.result:
  Auto merged
mysql-test/suite/ndb/t/ndb_restore.test:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
2007-08-28 15:47:12 +02:00
unknown
68eeedfded Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


extra/yassl/include/openssl/crypto.h:
  Auto merged
extra/yassl/include/openssl/ssl.h:
  Auto merged
extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
extra/yassl/src/yassl_int.cpp:
  Auto merged
vio/viossl.c:
  Auto merged
mysql-test/suite/rpl/t/rpl_ssl.test:
  Merge 5.0->5.1
2007-08-28 11:36:10 +02:00
unknown
dc4849576e Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


sql/field.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/rpl_record.cc:
  Auto merged
sql/rpl_utility.cc:
  Auto merged
sql/rpl_utility.h:
  Auto merged
2007-08-28 11:22:24 +02:00
unknown
152cfb04d9 Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into  mysql.com:/home/ksm/commits/mysql-5.1-new-rpl-2
2007-08-28 11:51:51 +04:00
unknown
0f950d6c38 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
2007-08-28 07:45:14 +02:00
unknown
9cbc7792e6 Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
sql/field.cc:
  Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
  - correct previous patch
2007-08-28 07:42:43 +02:00
unknown
95834a51f4 Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22-X
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


configure.in:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/partition_pruning.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/suite/rpl/include/rpl_mixed_ddl.inc:
  Auto merged
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
  Auto merged
mysql-test/suite/rpl/r/rpl_timezone.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_relayspace.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_timezone.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
netware/BUILD/compile-netware-END:
  Auto merged
netware/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/time.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
storage/innobase/srv/srv0srv.c:
  Auto merged
storage/innobase/trx/trx0trx.c:
  Auto merged
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
  manual merge (use remote)
mysql-test/suite/rpl/t/disabled.def:
  Manual merge - both rpl_innodb_mixed_ddl and rpl_innodb_mixed_dml
  are fixed, and should be run as part of the rpl suite.
2007-08-27 18:41:29 -06:00
unknown
05d3b8d682 Merge quant.(none):/ext/mysql/bkroot/mysql-5.1-target-5.1.22
into  quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-5.1.22-merge
2007-08-27 22:51:13 +02:00
unknown
ad4ee20673 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22
into  ramayana.hindu.god:/home/tsmith/m/bk/51-target22-X


sql/ha_partition.cc:
  Auto merged
2007-08-27 14:23:02 -06:00
unknown
048775df13 Bug #30412 and Bug #30413
Update some tests in the "parts" suite, so they're skipped if the
requisite plugins are not present in the mysqld.


mysql-test/suite/parts/t/partition_char_innodb.test:
  Skip if mysqld doesn't include InnoDB support
mysql-test/suite/parts/t/partition_datetime_innodb.test:
  Skip if mysqld doesn't include InnoDB support
mysql-test/suite/parts/t/partition_decimal_innodb.test:
  Skip if mysqld doesn't include InnoDB support
mysql-test/suite/parts/t/partition_float_innodb.test:
  Skip if mysqld doesn't include InnoDB support
mysql-test/suite/parts/t/partition_int_innodb.test:
  Skip if mysqld doesn't include InnoDB support
mysql-test/suite/parts/t/partition_special_innodb.test:
  Skip if mysqld doesn't include InnoDB support
mysql-test/suite/parts/t/rpl_partition.test:
  Skip if mysqld doesn't include partition support
2007-08-27 14:12:12 -06:00
unknown
bfed329e17 Fixes for the following bugs:
Bug #30316: Some "parts" tests fail because the server uses "--secure-file-priv"
Bug #30341: Test suite "parts" needs to be adapted to the new rules disallowing many functio
Bug #30408: Suite "parts" needs bug numbers updated
Bug #30411: Suite "parts" needs bug numbers updated: ER_UNIQUE_KEY_NEED_ALL_FIELDS_IN_PF
Bug #30576: part_supported_sql_func_innodb.test tries to LOAD DATA outside of var dir
Bug #30581: partition_value tests use disallowed CAST() function

Included are some general fixes to allow the "parts" test suite to be run
successfully.  This includes disabling a few tests or parts of tests,
cleaning up the test cases and their results, etc.  Basically, these tests
have not been run for some time, and had suffered some bit rot.

The bugs were fixed as a single changeset, because in some ways they depend
on each other.  I couldn't be sure I'd updated all the error codes (for
bugs 30408 and 30411) without also adapting to the new allowed functions
rules (bug 30341), and vice versa.


mysql-test/include/partition_layout.inc:
  Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc:
  Add ASCII(), ORD() and WEEKOFYEAR() as blocked functions (they depend
  too much on character set, etc.).
  
  Remove DATEDIFF() as a blocked function (it is implemented in terms
  of TO_DAYS() and the minus operator).
mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc:
  Remove ASCII(), ORD() and WEEKOFYEAR(), which are not allowed functions.
  
  Remove uses of CAST() in partitioning functions - it is not allowed.
  
  Disable testing of FLOOR() and CEILING on non-integer fields, due to
  Bug 30577.
  
  Test MOD() with an integer field instead of floating point (it has a
  hybrid result type, like FLOOR() and CEILING(), but makes sense to use
  with an integer field).
  
  Add DATEDIFF() as an allowed function, because it is implemented in
  terms of TO_DAYS() and the minus operator.
mysql-test/suite/parts/inc/partition_alter3.inc:
  Remove use of disallowed CAST() function in partitioning
mysql-test/suite/parts/inc/partition_blocked_sql_funcs.inc:
  The blocked functions are actually blocked now, so expect errors.
  
  This is a result of the fix for bug 18198.
mysql-test/suite/parts/inc/partition_date.inc:
  Remove uses of CAST() in partitioning functions - it is not allowed.
mysql-test/suite/parts/inc/partition_datetime.inc:
  Remove uses of CAST() in partitioning functions - it is not allowed.
mysql-test/suite/parts/inc/partition_decimal.inc:
  Remove uses of CAST() in partitioning functions - it is not allowed.
  
  Disable testing of FLOOR() and CEILING(), due to Bug 30577.
mysql-test/suite/parts/inc/partition_directory.inc:
  Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
mysql-test/suite/parts/inc/partition_double.inc:
  Remove uses of CAST() in partitioning functions - it is not allowed.
  
  Disable testing of FLOOR() and CEILING(), due to Bug 30577.
mysql-test/suite/parts/inc/partition_enum.inc:
  Remove use of CAST(), which is disallowed.
  
  Remove test which relies on CAST().
mysql-test/suite/parts/inc/partition_float.inc:
  Remove uses of CAST() in partitioning functions - it is not allowed.
  
  Disable testing of FLOOR() and CEILING(), due to Bug 30577.
mysql-test/suite/parts/inc/partition_layout_check1.inc:
  Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
mysql-test/suite/parts/inc/partition_layout_check2.inc:
  Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
mysql-test/suite/parts/inc/partition_methods1.inc:
  Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
mysql-test/suite/parts/inc/partition_set.inc:
  Remove test which relies on CAST(), which is disallowed.
mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc:
  Fix Bug #30576: part_supported_sql_func_innodb.test tries to LOAD DATA outside of var dir
  
  Move data files into std_data/parts/*, so they can be used with LOAD
  DATA INFILE '../std_data_ln/parts/*' while --secure-file-priv is in
  force.
mysql-test/suite/parts/inc/partition_syntax.inc:
  Remove use of CAST(), which is disallowed.
mysql-test/suite/parts/inc/partition_time.inc:
  Remove use of CAST(), which is disallowed.
mysql-test/suite/parts/inc/partition_timestamp.inc:
  Remove use of CAST(), which is disallowed.
mysql-test/suite/parts/inc/partition_value.inc:
  Disable this entire test file, because it relies on using CAST() as
  a partitioning function, which is disallowed.  See Bug 30581,
  "partition_value tests use disallowed CAST() function".
mysql-test/suite/parts/r/part_blocked_sql_func_innodb.result:
  Update test case results
mysql-test/suite/parts/r/part_blocked_sql_func_myisam.result:
  Update test case results
mysql-test/suite/parts/r/part_supported_sql_func_innodb.result:
  Update test case results
mysql-test/suite/parts/r/part_supported_sql_func_myisam.result:
  Update test case results
mysql-test/suite/parts/r/partition_alter3_innodb.result:
  Update test case results
mysql-test/suite/parts/r/partition_alter3_myisam.result:
  Update test case results
mysql-test/suite/parts/r/partition_basic_innodb.result:
  Update test case results
mysql-test/suite/parts/r/partition_basic_myisam.result:
  Update test case results
mysql-test/suite/parts/r/partition_datetime_innodb.result:
  Update test case results
mysql-test/suite/parts/r/partition_datetime_myisam.result:
  Update test case results
mysql-test/suite/parts/r/partition_decimal_innodb.result:
  Update test case results
mysql-test/suite/parts/r/partition_decimal_myisam.result:
  Update test case results
mysql-test/suite/parts/r/partition_float_myisam.result:
  Update test case results
mysql-test/suite/parts/r/partition_syntax_innodb.result:
  Update test case results
mysql-test/suite/parts/r/partition_syntax_myisam.result:
  Update test case results
mysql-test/suite/parts/t/disabled.def:
  Mark several more tests as disabled: partition_value_myisam,
  partition_value_innodb, part_supported_sql_func_ndb,
  rpl_ndb_dd_partitions, and partition_float_innodb
mysql-test/std_data/parts/part_supported_sql_funcs_int_ch1.inc:
  Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_ch1.inc
mysql-test/std_data/parts/part_supported_sql_funcs_int_date.inc:
  Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_date.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_date.inc
mysql-test/std_data/parts/part_supported_sql_funcs_int_float.inc:
  Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_float.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_float.inc
mysql-test/std_data/parts/part_supported_sql_funcs_int_int.inc:
  Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_int.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_int.inc
mysql-test/std_data/parts/part_supported_sql_funcs_int_time.inc:
  Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_time.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_time.inc
mysql-test/suite/parts/inc/partition_alter_1.inc:
  Correct expected error codes, which changed due to bug 29245.
mysql-test/suite/parts/inc/partition_check.inc:
  Correct expected error codes, which changed due to bug 29245.
mysql-test/suite/parts/inc/partition_syntax_1.inc:
  Correct expected error codes, which changed due to bug 29245.
2007-08-27 14:08:32 -06:00
unknown
76cf8367a6 Merge quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-5.1.22
into  quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-5.1.22-merge
2007-08-27 21:15:20 +02:00
unknown
013c96ceaa WL#3694 Replication of Invocation and Invoked Features Testing.
Bug#29020 Event results not correctly replicated to slave in RBR: partially.


mysql-test/suite/rpl/r/rpl_invoked_features.result:
  Updated result file.
mysql-test/suite/rpl/t/disabled.def:
  removed test cases: rpl_invoked_features and rpl_innodb_mixed_* (alreade were commented out)
mysql-test/suite/rpl/t/rpl_invoked_features.test:
  Added comments, implemented the waiting via include/wait_condition, minor fixes.
2007-08-27 18:44:13 +04:00
unknown
66262046a8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22


sql/field.cc:
  Auto merged
2007-08-27 15:41:24 +02:00
unknown
2bf5b1aa6c Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
sql/field.cc:
  - always pack in little endian, irrespective of starage engine native format
  - always unpack as if it is atored in little endian, and unpack it to storage engine native format
2007-08-27 15:40:49 +02:00