Commit graph

16 commits

Author SHA1 Message Date
unknown
186e3ee534 Bug#24392 (SHOW ENGINE MUTEX STATUS is a synonym for SHOW INNODB STATUS)
Before this fix, the command SHOW ENGINE <name> STATUS would:
- print a warning if the engine name is unknown,
- proceed and implement the same behavior as SHOW ENGINE ALL STATUS,
and list the status of all the storage engines registered.

In particular, this behavior caused confusion about the command :
SHOW ENGINE MUTEX STATUS, which as a side effect would print the status
of the innodb engine when that engine is registered.

Also, before this fix, every time an unknown engine name was substituted by
the default engine (which happen unless SQL_MODE NO_ENGINE_SUBSTITUTION is
set), a malformed warning was raised.
For example, the command ALTER TABLE T1 ENGINE = X would print :
Warnings:
Error 1286 Unknown table engine 'X'

With this fix:
SHOW ENGINE <name> STATUS|LOGS|MUTEX
always fails with an error when the engine <name> is unknown.

For other commands, warnings about unknown engines are raised as:
Warnings:
Warning 1286 Unknown table engine 'X'

In other words, engine substitution never affect the SHOW ENGINE command,
since this would lead to very confusing results.


mysql-test/r/ndb_dd_basic.result:
  Warnings for unknown engines.
mysql-test/r/partition_innodb.result:
  Warnings for unknown engines.
mysql-test/r/ps_1general.result:
  Fixed SHOW ENGINE <name> STATUS|LOGS|MUTEX
mysql-test/r/show_check.result:
  Fixed SHOW ENGINE <name> STATUS|LOGS|MUTEX
mysql-test/t/ps_1general.test:
  Fixed SHOW ENGINE <name> STATUS|LOGS|MUTEX
mysql-test/t/show_check.test:
  Fixed SHOW ENGINE <name> STATUS|LOGS|MUTEX
sql/sql_yacc.yy:
  Fixed SHOW ENGINE <name> STATUS|LOGS|MUTEX
2007-01-23 15:14:08 -07:00
unknown
715e63ae98 WL# 3031
Post-commit issues fixed
* Test results for other tests fixed due to added error #s
* Memory allocation/free issues found with running with valgrind
* Fix to mysql-test-run shell script to run federated_server test (installs
mysql.servers table properly)


mysql-test/r/1st.result:
  WL #3031
  
  New result for 1st test
mysql-test/r/backup.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/connect.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/information_schema.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/mysql.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/mysqlcheck.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/ndb_dd_basic.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/ndb_dd_ddl.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/select.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/show_check.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/sp.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/sp_gis.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/sp_trans.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/system_mysql_db.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/type_timestamp.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/warnings.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/xml.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
scripts/mysql_create_system_tables.sh:
  WL #3031
  
  Fixed old mysql-test-run.sh script to work with new mysql.servers table as reported
  by Cisco
sql/sql_yacc.yy:
  WL# 3031
  
  OPTIONS/options must be usable as table or column name.
storage/federated/ha_federated.cc:
  WL# 3031
  
  * Fixed allocation and free issues (warnings found with --valgrind)
  * Fixed cast issues
  * Made sure port was set accordingly
2006-12-08 22:19:51 -05:00
unknown
583655674b Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


mysql-test/r/ndb_dd_basic.result:
  Auto merged
mysql-test/r/ndb_dd_disk2memory.result:
  Auto merged
BitKeeper/deleted/.del-ndb_dd_advance.result:
  Auto merged
BitKeeper/deleted/.del-ndb_dd_advance2.result:
  Auto merged
2006-09-14 09:29:20 +02:00
unknown
c7f93b4170 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug20612


mysql-test/r/ndb_dd_basic.result:
  manual 1+1
mysql-test/t/ndb_dd_basic.test:
  manual 1+1
2006-09-11 08:45:22 +02:00
unknown
e1876e84c5 ndb - bug#20612 ins-del fix in tup
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  allocate separate copy tuple for delete after insert or update in same tx, instead of sharing pointer to same copy tuple.  this is an easy fix independent of commit/abort order of operations
mysql-test/r/ndb_dd_basic.result:
  test INS-DEL via assert in disk data code
mysql-test/t/ndb_dd_basic.test:
  test INS-DEL via assert in disk data code
2006-09-10 21:58:51 +02:00
unknown
a6c63a7110 Had issues with older clone where I could not pull latest patches. So I pulled a fresh clone. Moved updated test cases over and restested. Therefore I have to do a new commit for these files.
BitKeeper/deleted/.del-ndb_dd_advance.test:
  Delete: mysql-test/t/ndb_dd_advance.test
BitKeeper/deleted/.del-ndb_dd_advance2.test:
  Delete: mysql-test/t/ndb_dd_advance2.test
BitKeeper/deleted/.del-ndb_dd_advance.result:
  Delete: mysql-test/r/ndb_dd_advance.result
BitKeeper/deleted/.del-ndb_dd_advance2.result:
  Delete: mysql-test/r/ndb_dd_advance2.result
mysql-test/t/ndb_dd_alter.test:
  Moved from problem clone to new clone
mysql-test/r/ndb_dd_alter.result:
  Moved from problem clone to new clone
mysql-test/t/ndb_dd_sql_features.test:
  Moved from problem clone to new clone
mysql-test/r/ndb_dd_sql_features.result:
  Moved from problem clone to new clone
mysql-test/r/ndb_dd_basic.result:
  Moved from problem clone to new clone
mysql-test/t/ndb_dd_dump.test:
  Moved from problem clone to new clone
mysql-test/t/ndb_dd_basic.test:
  Moved from problem clone to new clone
mysql-test/t/ndb_dd_disk2memory.test:
  Moved from problem clone to new clone
mysql-test/r/ndb_dd_disk2memory.result:
  Moved from problem clone to new clone
2006-08-30 15:28:51 +02:00
unknown
78eb30e89d Bug#20841 mysqldump fails to store right info with --compatible=mysql40 option
- Add "not in version before" commensta around new syntax "WITH PARSER" and "TABLESPACE xxx STORAGE DISK"
 


mysql-test/r/ndb_dd_advance.result:
  Update result file
mysql-test/r/ndb_dd_advance2.result:
  Update result file
mysql-test/r/ndb_dd_backuprestore.result:
  Update result file
mysql-test/r/ndb_dd_basic.result:
  Update result file
mysql-test/r/ndb_dd_disk2memory.result:
  Update result file
sql/sql_show.cc:
  Add "not in version before"  comments around "WITH PARSER xxx" and "TABLESPACE xxx STORAGE DISK"
  Use STRING_WITH_LEN when adding fixed string AUTO_INCREMENT= to output from SHOW TABLE
2006-08-24 14:27:57 +02:00
unknown
e2e582d1fb handlerton cleanup:
duplicate fields removed, st_mysql_storage_engine added to support
run-time handlerton initialization (no compiler warnings), handler API
is now tied to MySQL version, handlerton->plugin mapping added
(slot-based), dummy default_hton removed, plugin-type-specific
initialization generalized, built-in plugins are now initialized too,
--default-storage-engine no longer needs a list of storage engines
in handle_options().

mysql-test-run.pl bugfixes


include/mysql/plugin.h:
  added st_mysql_storage_engine
  made handlerton tied to MySQL version
mysql-test/mysql-test-run.pl:
  bugfixes (umask, --no-defaults)
mysql-test/r/ndb_dd_basic.result:
  update error message
mysql-test/t/partition_mgm_err2.test:
  fix typo
sql/ha_berkeley.cc:
  handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
  initialize handlerton run-time to avoid compiler warnings
sql/ha_berkeley.h:
  handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
  initialize handlerton run-time to avoid compiler warnings
sql/ha_federated.cc:
  handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
  initialize handlerton run-time to avoid compiler warnings
sql/ha_heap.cc:
  handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
  initialize handlerton run-time to avoid compiler warnings
sql/ha_innodb.cc:
  handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
  initialize handlerton run-time to avoid compiler warnings
sql/ha_innodb.h:
  handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
  initialize handlerton run-time to avoid compiler warnings
sql/ha_myisam.cc:
  handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
  initialize handlerton run-time to avoid compiler warnings
sql/ha_myisammrg.cc:
  handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
  initialize handlerton run-time to avoid compiler warnings
sql/ha_ndbcluster.cc:
  handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
  initialize handlerton run-time to avoid compiler warnings
sql/ha_ndbcluster.h:
  handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
  initialize handlerton run-time to avoid compiler warnings
sql/ha_ndbcluster_binlog.cc:
  no 'name' in the handlerton anymore
sql/ha_partition.cc:
  handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
  initialize handlerton run-time to avoid compiler warnings
sql/handler.cc:
  handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
  handlerton->plugin mapping
sql/handler.h:
  handlerton cleanup: remove duplicate fields
sql/log.cc:
  handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
  initialize handlerton run-time to avoid compiler warnings
sql/mysql_priv.h:
  handler.h needs plugin.h
sql/mysqld.cc:
  Convert --default-storage-engine to a handlerton* when
  all storage engines are initialized and not in getopt
sql/set_var.cc:
  no name in the handlerton anymore
sql/sql_parse.cc:
  no default_hton anymore
sql/sql_partition.cc:
  no name in the handlerton anymore
sql/sql_plugin.cc:
  generalize plugin type-specific initialization.
  initialize built-in plugins too
sql/sql_plugin.h:
  generalize plugin type-specific initialization.
sql/sql_show.cc:
  st_mysql_storage_engine structure
  no name in the handlerton anymore
sql/sql_table.cc:
  no name in the handlerton anymore
  no default_hton anymore
sql/sql_tablespace.cc:
  no name in the handlerton anymore
  no default_hton anymore
sql/sql_yacc.yy:
  no default_hton anymore
  issue "unknown storage engine" warning where it is discovered
storage/archive/ha_archive.cc:
  handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
  initialize handlerton run-time to avoid compiler warnings
storage/archive/ha_archive.h:
  handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
  initialize handlerton run-time to avoid compiler warnings
storage/blackhole/ha_blackhole.cc:
  handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
  initialize handlerton run-time to avoid compiler warnings
storage/csv/ha_tina.cc:
  handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
  initialize handlerton run-time to avoid compiler warnings
storage/example/ha_example.cc:
  handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
  initialize handlerton run-time to avoid compiler warnings
2006-05-28 14:51:01 +02:00
unknown
0e336304d0 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


mysql-test/r/ndb_dd_basic.result:
  Auto merged
mysql-test/r/ndb_partition_key.result:
  Auto merged
mysql-test/t/ndb_partition_key.test:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.cc:
  Auto merged
2006-05-12 12:22:31 -04:00
unknown
4e3f4e970f BUG#19010: Fix issues with that ALTER TABLE from auto-partitioned NDB table doesn't work unless primary key exists on table.
mysql-test/r/ndb_bitfield.result:
  Test cases changes now that auto-partitioning is remembered in frm file
mysql-test/r/ndb_dd_basic.result:
  Test cases changes now that auto-partitioning is remembered in frm file
mysql-test/r/ndb_dd_disk2memory.result:
  Test cases changes now that auto-partitioning is remembered in frm file
mysql-test/r/ndb_gis.result:
  Test cases changes now that auto-partitioning is remembered in frm file
mysql-test/r/ndb_partition_key.result:
  New test cases for auto-partitioning change that was made to fix bug
mysql-test/r/rpl_ndb_UUID.result:
  Test cases changes now that auto-partitioning is remembered in frm file
mysql-test/r/rpl_ndb_dd_advance.result:
  Test cases changes now that auto-partitioning is remembered in frm file
mysql-test/t/ndb_partition_key.test:
  New test cases for auto-partitioning change that was made to fix bug
sql/partition_info.h:
  New boolean to keep track of auto partitioned or not
sql/sql_partition.cc:
  Ensure that auto-partitiong flag is reset when partitions are dropped, added, reorganised or coalesced.
  Ensure that auto-partitioned tables are altered into non-partitioned table when ALTER TABLE t1 engine=X
  is performed.
sql/sql_show.cc:
  Only print partition info for non-auto-partitioned tables
sql/sql_table.cc:
  Set auto partition flag when auto partitions are generated in create table
sql/table.cc:
  Fix reading of frm file where new auto-partition flag is introduced.
sql/table.h:
  New flag for auto partition on share object
sql/unireg.cc:
  Fix code for writing frm to also write autopartition flag at end of partition info, fix some length issues
  at the same time that was in this part that caused no problems since partition info always was the last info
  in the file.
2006-05-10 12:53:40 -04:00
unknown
5484972485 After merge fix 2006-05-04 22:30:01 +03:00
unknown
8b308fbbc5 bug#18604 create logfile for MyISAM tables
- changed alter tablespace truct to work with handlerton pointer (to avoid crash in parser on unknown db type"
- pushed warnings when default storage engine is used and/or tablespace stuff is not supported by storage engine


mysql-test/r/ndb_dd_basic.result:
  bug#18604 create logfile for MyISAM tables
mysql-test/t/ndb_dd_basic.test:
  bug#18604 create logfile for MyISAM tables
2006-04-24 18:26:30 +02:00
unknown
338707ad48 Fix results due to change in SHOW CREATE TABLE output
mysql-test/r/ndb_bitfield.result:
  Update result
mysql-test/r/ndb_dd_basic.result:
  Update result
mysql-test/r/ndb_dd_disk2memory.result:
  Update result
mysql-test/r/ndb_partition_key.result:
  Update result
mysql-test/r/ndb_partition_range.result:
  Update result
mysql-test/r/ndb_temporary.result:
  Update result
mysql-test/r/rpl_ndb_UUID.result:
  Update result
2006-02-17 14:41:57 -08:00
unknown
9796f9c960 MySQL Bugs: #16466: DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK 2006-02-01 11:56:20 +01:00
unknown
bbed1ba99f Changes done from Jonas's review of pervious commit
mysql-test/t/ndb_dd_basic.test:
  Changed test.t1 back to t1 per Jonas's review
mysql-test/r/ndb_dd_basic.result:
  Changed test.t1 back to t1 per Jonas's review
2006-01-11 18:50:04 +01:00
unknown
0c64879d8c Test clean up and moving over from old clone.
mysql-test/t/ndb_dd_basic.test:
  Rename: mysql-test/t/ndb_basic_disk.test -> mysql-test/t/ndb_dd_basic.test
mysql-test/r/ndb_dd_basic.result:
  Rename: mysql-test/r/ndb_basic_disk.result -> mysql-test/r/ndb_dd_basic.result
mysql-test/t/ndb_dd_ddl.test:
  New Disk Data DDL Test case. Formally know as ndb_dd_dupcase.test
mysql-test/r/ndb_dd_ddl.result:
  New Disk Data DDL Test case. Formally know as ndb_dd_dupcase.test
2006-01-11 17:06:14 +01:00
Renamed from mysql-test/r/ndb_basic_disk.result (Browse further)