| List: | Internals | « Previous MessageNext Message » | |
| From: | jonas | Date: | October 26 2005 3:59pm |
| Subject: | bk commit into 5.1 tree (jonas:1.1942) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.1 repository of jonas. When jonas does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet 1.1942 05/10/26 15:59:23 jonas@stripped +16 -0 Import mysql part of ndb diskdata sql/sql_tablespace.cc 1.1 05/10/26 15:59:18 jonas@stripped +52 -0 New BitKeeper file ``sql/sql_tablespace.cc'' sql/sql_tablespace.cc 1.0 05/10/26 15:59:18 jonas@stripped +0 -0 BitKeeper file /home/jonas/src/51-dd/sql/sql_tablespace.cc mysql-test/t/ndb_basic_disk.test 1.1 05/10/26 15:59:17 jonas@stripped +274 -0 New BitKeeper file ``mysql-test/t/ndb_basic_disk.test'' mysql-test/r/ndb_basic_disk.result 1.1 05/10/26 15:59:17 jonas@stripped +351 -0 New BitKeeper file ``mysql-test/r/ndb_basic_disk.result'' mysql-test/t/ndb_basic_disk.test 1.0 05/10/26 15:59:17 jonas@stripped +0 -0 BitKeeper file /home/jonas/src/51-dd/mysql-test/t/ndb_basic_disk.test mysql-test/r/ndb_basic_disk.result 1.0 05/10/26 15:59:17 jonas@stripped +0 -0 BitKeeper file /home/jonas/src/51-dd/mysql-test/r/ndb_basic_disk.result storage/ndb/src/kernel/blocks/pgman.cpp 1.2 05/10/25 10:09:00 jonas@stripped[jonas] +0 -2 Import mysql part of ndb diskdata sql/sql_yacc.yy 1.421 05/10/25 10:08:59 jonas@stripped[jonas] +452 -2 Import mysql part of ndb diskdata sql/sql_parse.cc 1.484 05/10/25 10:08:59 jonas@stripped[jonas] +6 -0 Import mysql part of ndb diskdata sql/sql_lex.h 1.204 05/10/25 10:08:59 jonas@stripped[jonas] +8 -0 Import mysql part of ndb diskdata sql/share/errmsg.txt 1.52 05/10/25 10:09:00 jonas@stripped[jonas] +14 -0 Import mysql part of ndb diskdata sql/mysql_priv.h 1.343 05/10/26 15:30:55 jonas@stripped[jonas] +1 -0 Import mysql part of ndb diskdata sql/lex.h 1.146 05/10/25 10:08:59 jonas@stripped[jonas] +18 -1 Import mysql part of ndb diskdata sql/handler.h 1.166 05/10/25 10:08:59 jonas@stripped[jonas] +79 -1 Import mysql part of ndb diskdata sql/ha_ndbcluster.h 1.100 05/10/25 10:08:59 jonas@stripped[jonas] +1 -0 Import mysql part of ndb diskdata sql/ha_ndbcluster.cc 1.222 05/10/25 10:08:59 jonas@stripped[jonas] +2 -12 Import mysql part of ndb diskdata sql/Makefile.am 1.119 05/10/25 10:08:59 jonas@stripped[jonas] +1 -1 Import mysql part of ndb diskdata mysql-test/t/disabled.def 1.11 05/10/13 10:52:12 jonas@stripped[jonas] +0 -2 Import mysql part of ndb diskdata libmysqld/Makefile.am 1.71 05/10/25 10:08:59 jonas@stripped[jonas] +2 -1 Import mysql part of ndb diskdata # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: jonas # Host: perch.ndb.mysql.com # Root: /home/jonas/src/51-dd --- 1.118/sql/Makefile.am 2005-10-22 00:59:13 +02:00 +++ 1.119/sql/Makefile.am 2005-10-25 10:08:59 +02:00 @@ -92,7 +92,7 @@ tztime.cc my_time.c my_decimal.cc\ sp_head.cc sp_pcontext.cc sp_rcontext.cc sp.cc \ sp_cache.cc parse_file.cc sql_trigger.cc \ - handlerton.cc + handlerton.cc sql_tablespace.cc EXTRA_mysqld_SOURCES = ha_innodb.cc ha_berkeley.cc ha_archive.cc \ ha_blackhole.cc ha_federated.cc ha_ndbcluster.cc \ ha_partition.cc \ --- 1.165/sql/handler.h 2005-10-22 00:59:19 +02:00 +++ 1.166/sql/handler.h 2005-10-25 10:08:59 +02:00 @@ -668,7 +668,7 @@ { CHARSET_INFO *table_charset, *default_table_charset; LEX_STRING connect_string; - const char *comment,*password; + const char *comment,*password, *tablespace; const char *data_file_name, *index_file_name; const char *alias; ulonglong max_rows,min_rows; @@ -688,6 +688,7 @@ bool table_existed; /* 1 in create if table existed */ bool frm_only; /* 1 if no ha_create_table() */ bool varchar; /* 1 if table has a VARCHAR */ + bool store_on_disk; /* 1 if table stored on disk */ } HA_CREATE_INFO; @@ -755,6 +756,81 @@ byte *end_of_used_area; /* End of area that was used by handler */ } HANDLER_BUFFER; +/* + These structures are used to pass information from a set of SQL commands + on add/drop/change tablespace definitions to the proper storage engine. +*/ +#define UNDEF_NODEGROUP 65535 +enum ts_command_type +{ + TS_CMD_NOT_DEFINED = -1, + CREATE_TABLESPACE = 0, + ALTER_TABLESPACE = 1, + CREATE_LOGFILE_GROUP = 2, + ALTER_LOGFILE_GROUP = 3, + DROP_TABLESPACE = 4, + DROP_LOGFILE_GROUP = 5, + CHANGE_FILE_TABLESPACE = 6, + ALTER_ACCESS_MODE_TABLESPACE = 7 +}; + +enum ts_alter_tablespace_type +{ + TS_ALTER_TABLESPACE_TYPE_NOT_DEFINED = -1, + ALTER_TABLESPACE_ADD_FILE = 1, + ALTER_TABLESPACE_DROP_FILE = 2 +}; + +enum tablespace_access_mode +{ + TS_NOT_DEFINED= -1, + TS_READ_ONLY = 0, + TS_READ_WRITE = 1, + TS_NOT_ACCESSIBLE = 2 +}; + +class st_alter_tablespace : public Sql_alloc +{ + public: + char *tablespace_name; + char *logfile_group_name; + enum ts_command_type ts_cmd_type; + enum ts_alter_tablespace_type ts_alter_tablespace_type; + char *data_file_name; + char *undo_file_name; + char *redo_file_name; + ulonglong extent_size; + ulonglong undo_buffer_size; + ulonglong redo_buffer_size; + ulonglong initial_size; + ulonglong autoextend_size; + ulonglong max_size; + uint nodegroup_id; + enum db_type storage_engine; + bool wait_until_completed; + char *ts_comment; + enum tablespace_access_mode ts_access_mode; + st_alter_tablespace() + { + tablespace_name= NULL; + logfile_group_name= "DEFAULT_LG"; //Default log file group + ts_cmd_type= TS_CMD_NOT_DEFINED; + data_file_name= NULL; + undo_file_name= NULL; + redo_file_name= NULL; + extent_size= 1024*1024; //Default 1 MByte + undo_buffer_size= 8*1024*1024; //Default 8 MByte + redo_buffer_size= 8*1024*1024; //Default 8 MByte + initial_size= 128*1024*1024; //Default 128 MByte + autoextend_size= 0; //No autoextension as default + max_size= 0; //Max size == initial size => no extension + storage_engine= DB_TYPE_UNKNOWN; + nodegroup_id= UNDEF_NODEGROUP; + wait_until_completed= TRUE; + ts_comment= NULL; + ts_access_mode= TS_NOT_DEFINED; + } +}; class handler :public Sql_alloc { @@ -1215,6 +1291,8 @@ virtual int assign_to_keycache(THD* thd, HA_CHECK_OPT* check_opt) { return HA_ADMIN_NOT_IMPLEMENTED; } virtual int preload_keys(THD* thd, HA_CHECK_OPT* check_opt) + { return HA_ADMIN_NOT_IMPLEMENTED; } + virtual int alter_tablespace(st_alter_tablespace *alter_tablespace_info) { return HA_ADMIN_NOT_IMPLEMENTED; } /* end of the list of admin commands */ --- 1.145/sql/lex.h 2005-10-20 16:30:31 +02:00 +++ 1.146/sql/lex.h 2005-10-25 10:08:59 +02:00 @@ -59,6 +59,7 @@ { "<<", SYM(SHIFT_LEFT)}, { ">>", SYM(SHIFT_RIGHT)}, { "<=>", SYM(EQUAL_SYM)}, + { "ACCESSIBLE", SYM(ACCESSIBLE_SYM)}, { "ACTION", SYM(ACTION)}, { "ADD", SYM(ADD)}, { "AFTER", SYM(AFTER_SYM)}, @@ -75,6 +76,7 @@ { "ASCII", SYM(ASCII_SYM)}, { "ASENSITIVE", SYM(ASENSITIVE_SYM)}, { "AUTO_INCREMENT", SYM(AUTO_INC)}, + { "AUTOEXTEND_SIZE", SYM(AUTOEXTEND_SIZE_SYM)}, { "AVG", SYM(AVG_SYM)}, { "AVG_ROW_LENGTH", SYM(AVG_ROW_LENGTH)}, { "BACKUP", SYM(BACKUP_SYM)}, @@ -139,6 +141,7 @@ { "DATA", SYM(DATA_SYM)}, { "DATABASE", SYM(DATABASE)}, { "DATABASES", SYM(DATABASES)}, + { "DATAFILE", SYM(DATAFILE_SYM)}, { "DATE", SYM(DATE_SYM)}, { "DATETIME", SYM(DATETIME)}, { "DAY", SYM(DAY_SYM)}, @@ -162,6 +165,7 @@ { "DIRECTORY", SYM(DIRECTORY_SYM)}, { "DISABLE", SYM(DISABLE_SYM)}, { "DISCARD", SYM(DISCARD)}, + { "DISK", SYM(DISK_SYM)}, { "DISTINCT", SYM(DISTINCT)}, { "DISTINCTROW", SYM(DISTINCT)}, /* Access likes this */ { "DIV", SYM(DIV_SYM)}, @@ -191,6 +195,7 @@ { "EXPANSION", SYM(EXPANSION_SYM)}, { "EXPLAIN", SYM(DESCRIBE)}, { "EXTENDED", SYM(EXTENDED_SYM)}, + { "EXTENT_SIZE", SYM(EXTENT_SIZE_SYM)}, { "FALSE", SYM(FALSE_SYM)}, { "FAST", SYM(FAST_SYM)}, { "FETCH", SYM(FETCH_SYM)}, @@ -239,6 +244,7 @@ { "INDEX", SYM(INDEX_SYM)}, { "INDEXES", SYM(INDEXES)}, { "INFILE", SYM(INFILE)}, + { "INITIAL_SIZE", SYM(INITIAL_SIZE_SYM)}, { "INNER", SYM(INNER_SYM)}, { "INNOBASE", SYM(INNOBASE_SYM)}, { "INNODB", SYM(INNOBASE_SYM)}, @@ -290,6 +296,7 @@ { "LOCALTIMESTAMP", SYM(NOW_SYM)}, { "LOCK", SYM(LOCK_SYM)}, { "LOCKS", SYM(LOCKS_SYM)}, + { "LOGFILE", SYM(LOGFILE_SYM)}, { "LOGS", SYM(LOGS_SYM)}, { "LONG", SYM(LONG_SYM)}, { "LONGBLOB", SYM(LONGBLOB)}, @@ -315,6 +322,7 @@ { "MAX_CONNECTIONS_PER_HOUR", SYM(MAX_CONNECTIONS_PER_HOUR)}, { "MAX_QUERIES_PER_HOUR", SYM(MAX_QUERIES_PER_HOUR)}, { "MAX_ROWS", SYM(MAX_ROWS)}, + { "MAX_SIZE", SYM(MAX_SIZE_SYM)}, { "MAX_UPDATES_PER_HOUR", SYM(MAX_UPDATES_PER_HOUR)}, { "MAX_USER_CONNECTIONS", SYM(MAX_USER_CONNECTIONS_SYM)}, { "MAXVALUE", SYM(MAX_VALUE_SYM)}, @@ -322,6 +330,7 @@ { "MEDIUMBLOB", SYM(MEDIUMBLOB)}, { "MEDIUMINT", SYM(MEDIUMINT)}, { "MEDIUMTEXT", SYM(MEDIUMTEXT)}, + { "MEMORY", SYM(MEMORY_SYM)}, { "MERGE", SYM(MERGE_SYM)}, { "MICROSECOND", SYM(MICROSECOND_SYM)}, { "MIDDLEINT", SYM(MEDIUMINT)}, /* For powerbuilder */ @@ -349,7 +358,8 @@ { "NEW", SYM(NEW_SYM)}, { "NEXT", SYM(NEXT_SYM)}, { "NO", SYM(NO_SYM)}, - { "NODEGROUP", SYM(NODEGROUP_SYM)}, + { "NO_WAIT", SYM(NO_WAIT_SYM)}, + { "NODEGROUP", SYM(NODEGROUP_SYM)}, { "NONE", SYM(NONE_SYM)}, { "NOT", SYM(NOT_SYM)}, { "NO_WRITE_TO_BINLOG", SYM(NO_WRITE_TO_BINLOG)}, @@ -398,9 +408,13 @@ { "RAID_TYPE", SYM(RAID_TYPE)}, { "RANGE", SYM(RANGE_SYM)}, { "READ", SYM(READ_SYM)}, + { "READ_ONLY", SYM(READ_ONLY_SYM)}, + { "READ_WRITE", SYM(READ_WRITE_SYM)}, { "READS", SYM(READS_SYM)}, { "REAL", SYM(REAL)}, { "RECOVER", SYM(RECOVER_SYM)}, + { "REDO_BUFFER_SIZE", SYM(REDO_BUFFER_SIZE_SYM)}, + { "REDOFILE", SYM(REDOFILE_SYM)}, { "REDUNDANT", SYM(REDUNDANT_SYM)}, { "REFERENCES", SYM(REFERENCES)}, { "REGEXP", SYM(REGEXP)}, @@ -520,6 +534,8 @@ { "TYPES", SYM(TYPES_SYM)}, { "UNCOMMITTED", SYM(UNCOMMITTED_SYM)}, { "UNDEFINED", SYM(UNDEFINED_SYM)}, + { "UNDO_BUFFER_SIZE", SYM(UNDO_BUFFER_SIZE_SYM)}, + { "UNDOFILE", SYM(UNDOFILE_SYM)}, { "UNDO", SYM(UNDO_SYM)}, { "UNICODE", SYM(UNICODE_SYM)}, { "UNION", SYM(UNION_SYM)}, @@ -546,6 +562,7 @@ { "VARCHARACTER", SYM(VARCHAR)}, { "VARIABLES", SYM(VARIABLES)}, { "VARYING", SYM(VARYING)}, + { "WAIT", SYM(WAIT_SYM)}, { "WARNINGS", SYM(WARNINGS)}, { "WEEK", SYM(WEEK_SYM)}, { "WHEN", SYM(WHEN_SYM)}, --- 1.342/sql/mysql_priv.h 2005-10-25 19:44:44 +02:00 +++ 1.343/sql/mysql_priv.h 2005-10-26 15:30:55 +02:00 @@ -675,6 +675,7 @@ bool mysql_xa_recover(THD *thd); bool check_simple_select(); +int mysql_alter_tablespace(st_alter_tablespace *ts_info); SORT_FIELD * make_unireg_sortorder(ORDER *order, uint *length); int setup_order(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables, --- 1.203/sql/sql_lex.h 2005-10-22 01:02:46 +02:00 +++ 1.204/sql/sql_lex.h 2005-10-25 10:08:59 +02:00 @@ -25,6 +25,7 @@ class sp_name; class sp_instr; class sp_pcontext; +class st_alter_tablespace; class partition_info; /* @@ -91,6 +92,7 @@ SQLCOM_CREATE_TRIGGER, SQLCOM_DROP_TRIGGER, SQLCOM_XA_START, SQLCOM_XA_END, SQLCOM_XA_PREPARE, SQLCOM_XA_COMMIT, SQLCOM_XA_ROLLBACK, SQLCOM_XA_RECOVER, + SQLCOM_ALTER_TABLESPACE, SQLCOM_INSTALL_PLUGIN, SQLCOM_UNINSTALL_PLUGIN, /* This should be the last !!! */ @@ -911,6 +913,12 @@ during replication ("LOCAL 'filename' REPLACE INTO" part). */ uchar *fname_start, *fname_end; + + /* + Reference to a struct that contains information in various commands + to add/create/drop/change table spaces. + */ + st_alter_tablespace *alter_tablespace_info; bool escape_used; --- 1.483/sql/sql_parse.cc 2005-10-22 01:02:47 +02:00 +++ 1.484/sql/sql_parse.cc 2005-10-25 10:08:59 +02:00 @@ -4761,6 +4761,12 @@ case SQLCOM_XA_RECOVER: res= mysql_xa_recover(thd); break; + case SQLCOM_ALTER_TABLESPACE: + if (check_access(thd, ALTER_ACL, thd->db, 0, 1, 0, thd->db ? is_schema_db(thd->db) : 0)) + break; + if (!(res= mysql_alter_tablespace(lex->alter_tablespace_info))) + send_ok(thd); + break; case SQLCOM_INSTALL_PLUGIN: if (! (res= mysql_install_plugin(thd, &thd->lex->comment, &thd->lex->ident))) --- 1.420/sql/sql_yacc.yy 2005-10-22 01:02:48 +02:00 +++ 1.421/sql/sql_yacc.yy 2005-10-25 10:08:59 +02:00 @@ -120,6 +120,7 @@ %token END_OF_INPUT %token ABORT_SYM +%token ACCESSIBLE_SYM %token ACTION %token ADD %token ADDDATE_SYM @@ -139,6 +140,7 @@ %token ASENSITIVE_SYM %token ATAN %token AUTO_INC +%token AUTOEXTEND_SIZE_SYM %token AVG_ROW_LENGTH %token AVG_SYM %token BACKUP_SYM @@ -207,6 +209,7 @@ %token CURTIME %token DATABASE %token DATABASES +%token DATAFILE_SYM %token DATA_SYM %token DATETIME %token DATE_ADD_INTERVAL @@ -236,6 +239,7 @@ %token DIRECTORY_SYM %token DISABLE_SYM %token DISCARD +%token DISK_SYM %token DISTINCT %token DIV_SYM %token DOUBLE_SYM @@ -268,6 +272,7 @@ %token EXPANSION_SYM %token EXPORT_SET %token EXTENDED_SYM +%token EXTENT_SIZE_SYM %token EXTRACT_SYM %token FALSE_SYM %token FAST_SYM @@ -330,6 +335,7 @@ %token INDEXES %token INDEX_SYM %token INFILE +%token INITIAL_SIZE_SYM %token INNER_SYM %token INNOBASE_SYM %token INOUT_SYM @@ -376,6 +382,7 @@ %token LOCATOR_SYM %token LOCKS_SYM %token LOCK_SYM +%token LOGFILE_SYM %token LOGS_SYM %token LOG_SYM %token LONGBLOB @@ -406,6 +413,7 @@ %token MAX_CONNECTIONS_PER_HOUR %token MAX_QUERIES_PER_HOUR %token MAX_ROWS +%token MAX_SIZE_SYM %token MAX_SYM %token MAX_UPDATES_PER_HOUR %token MAX_USER_CONNECTIONS_SYM @@ -414,6 +422,7 @@ %token MEDIUMINT %token MEDIUMTEXT %token MEDIUM_SYM +%token MEMORY_SYM %token MERGE_SYM %token MICROSECOND_SYM %token MIGRATE_SYM @@ -450,6 +459,7 @@ %token NOT_SYM %token NOW_SYM %token NO_SYM +%token NO_WAIT_SYM %token NO_WRITE_TO_BINLOG %token NULL_SYM %token NUM @@ -505,9 +515,13 @@ %token RAND %token RANGE_SYM %token READS_SYM +%token READ_ONLY_SYM %token READ_SYM +%token READ_WRITE_SYM %token REAL %token RECOVER_SYM +%token REDO_BUFFER_SIZE_SYM +%token REDOFILE_SYM %token REDUNDANT_SYM %token REFERENCES %token REGEXP @@ -629,6 +643,8 @@ %token ULONGLONG_NUM %token UNCOMMITTED_SYM %token UNDEFINED_SYM +%token UNDO_BUFFER_SIZE_SYM +%token UNDOFILE_SYM %token UNDERSCORE_CHARSET %token UNDO_SYM %token UNICODE_SYM @@ -659,6 +675,7 @@ %token VARIANCE_SYM %token VARYING %token VIEW_SYM +%token WAIT_SYM %token WARNINGS %token WEEK_SYM %token WHEN_SYM @@ -726,7 +743,7 @@ ulong_num raid_types merge_insert_types %type <ulonglong_number> - ulonglong_num + ulonglong_num size_number %type <longlong_number> part_bit_expr @@ -1298,6 +1315,16 @@ } opt_view_list AS select_view_init check_option {} + | CREATE LOGFILE_SYM GROUP logfile_group_info + { + LEX *lex= Lex; + lex->alter_tablespace_info->ts_cmd_type= CREATE_LOGFILE_GROUP; + } + | CREATE TABLESPACE tablespace_info + { + LEX *lex= Lex; + lex->alter_tablespace_info->ts_cmd_type= CREATE_TABLESPACE; + } | CREATE TRIGGER_SYM sp_name trg_action_time trg_event ON table_ident FOR_SYM EACH_SYM ROW_SYM { @@ -2559,6 +2586,382 @@ | DELETE_SYM { Lex->trg_chistics.event= TRG_EVENT_DELETE; } ; +/* + This part of the parser contains common code for all TABLESPACE + commands. + CREATE TABLESPACE name ... + ALTER TABLESPACE name CHANGE DATAFILE ... + ALTER TABLESPACE name ADD DATAFILE ... + ALTER TABLESPACE name access_mode + CREATE LOGFILE GROUP name ... + ALTER LOGFILE GROUP name ADD UNDOFILE .. + ALTER LOGFILE GROUP name ADD REDOFILE .. + DROP TABLESPACE name + DROP LOGFILE GROUP name +*/ +change_tablespace_access: + tablespace_name + ts_access_mode + ; + +change_tablespace_info: + tablespace_name + CHANGE ts_datafile + change_ts_option_list + ; + +tablespace_info: + tablespace_name + ADD ts_datafile + opt_logfile_group_name + tablespace_option_list + ; + +opt_logfile_group_name: + /* empty */ {} + | USE_SYM LOGFILE_SYM GROUP ident + { + LEX *lex= Lex; + lex->alter_tablespace_info->logfile_group_name= $4.str; + }; + +alter_tablespace_info: + tablespace_name + ADD ts_datafile + alter_tablespace_option_list + { + Lex->alter_tablespace_info->ts_alter_tablespace_type= ALTER_TABLESPACE_ADD_FILE; + } + | + tablespace_name + DROP ts_datafile + alter_tablespace_option_list + { + Lex->alter_tablespace_info->ts_alter_tablespace_type= ALTER_TABLESPACE_DROP_FILE; + }; + +logfile_group_info: + logfile_group_name + add_log_file + logfile_group_option_list + ; + +alter_logfile_group_info: + logfile_group_name + add_log_file + alter_logfile_group_option_list + ; + +add_log_file: + ADD lg_undofile + | ADD lg_redofile + ; + +change_ts_option_list: + /* empty */ {} + change_ts_options + ; + +change_ts_options: + change_ts_option + | change_ts_options change_ts_option + | change_ts_options ',' change_ts_option + ; + +change_ts_option: + opt_ts_initial_size + | opt_ts_autoextend_size + | opt_ts_max_size + ; + +tablespace_option_list: + /* empty */ {} + tablespace_options + ; + +tablespace_options: + tablespace_option + | tablespace_options tablespace_option + | tablespace_options ',' tablespace_option + ; + +tablespace_option: + opt_ts_initial_size + | opt_ts_autoextend_size + | opt_ts_max_size + | opt_ts_extent_size + | opt_ts_nodegroup + | opt_ts_engine + | ts_wait + | opt_ts_comment + ; + +alter_tablespace_option_list: + /* empty */ {} + alter_tablespace_options + ; + +alter_tablespace_options: + alter_tablespace_option + | alter_tablespace_options alter_tablespace_option + | alter_tablespace_options ',' alter_tablespace_option + ; + +alter_tablespace_option: + opt_ts_initial_size + | opt_ts_autoextend_size + | opt_ts_max_size + | opt_ts_engine + | ts_wait + ; + +logfile_group_option_list: + /* empty */ {} + logfile_group_options + ; + +logfile_group_options: + logfile_group_option + | logfile_group_options logfile_group_option + | logfile_group_options ',' logfile_group_option + ; + +logfile_group_option: + opt_ts_initial_size + | opt_ts_undo_buffer_size + | opt_ts_redo_buffer_size + | opt_ts_nodegroup + | opt_ts_engine + | ts_wait + | opt_ts_comment + ; + +alter_logfile_group_option_list: + /* empty */ {} + alter_logfile_group_options + ; + +alter_logfile_group_options: + alter_logfile_group_option + | alter_logfile_group_options alter_logfile_group_option + | alter_logfile_group_options ',' alter_logfile_group_option + ; + +alter_logfile_group_option: + opt_ts_initial_size + | opt_ts_engine + | ts_wait + ; + + +ts_datafile: + DATAFILE_SYM TEXT_STRING_sys + { + LEX *lex= Lex; + lex->alter_tablespace_info->data_file_name= $2.str; + }; + +lg_undofile: + UNDOFILE_SYM TEXT_STRING_sys + { + LEX *lex= Lex; + lex->alter_tablespace_info->undo_file_name= $2.str; + }; + +lg_redofile: + REDOFILE_SYM TEXT_STRING_sys + { + LEX *lex= Lex; + lex->alter_tablespace_info->redo_file_name= $2.str; + }; + +tablespace_name: + ident + { + LEX *lex= Lex; + lex->alter_tablespace_info= new st_alter_tablespace(); + lex->alter_tablespace_info->tablespace_name= $1.str; + lex->sql_command= SQLCOM_ALTER_TABLESPACE; + }; + +logfile_group_name: + ident + { + LEX *lex= Lex; + lex->alter_tablespace_info= new st_alter_tablespace(); + lex->alter_tablespace_info->logfile_group_name= $1.str; + lex->sql_command= SQLCOM_ALTER_TABLESPACE; + }; + +ts_access_mode: + READ_ONLY_SYM + { + LEX *lex= Lex; + lex->alter_tablespace_info->ts_access_mode= TS_READ_ONLY; + } + | READ_WRITE_SYM + { + LEX *lex= Lex; + lex->alter_tablespace_info->ts_access_mode= TS_READ_WRITE; + } + | NOT_SYM ACCESSIBLE_SYM + { + LEX *lex= Lex; + lex->alter_tablespace_info->ts_access_mode= TS_NOT_ACCESSIBLE; + }; + +opt_ts_initial_size: + INITIAL_SIZE_SYM opt_equal size_number + { + LEX *lex= Lex; + lex->alter_tablespace_info->initial_size= $3; + }; + +opt_ts_autoextend_size: + AUTOEXTEND_SIZE_SYM opt_equal size_number + { + LEX *lex= Lex; + lex->alter_tablespace_info->autoextend_size= $3; + }; + +opt_ts_max_size: + MAX_SIZE_SYM opt_equal size_number + { + LEX *lex= Lex; + lex->alter_tablespace_info->max_size= $3; + }; + +opt_ts_extent_size: + EXTENT_SIZE_SYM opt_equal size_number + { + LEX *lex= Lex; + lex->alter_tablespace_info->extent_size= $3; + }; + +opt_ts_undo_buffer_size: + UNDO_BUFFER_SIZE_SYM opt_equal size_number + { + LEX *lex= Lex; + lex->alter_tablespace_info->undo_buffer_size= $3; + }; + +opt_ts_redo_buffer_size: + REDO_BUFFER_SIZE_SYM opt_equal size_number + { + LEX *lex= Lex; + lex->alter_tablespace_info->redo_buffer_size= $3; + }; + +opt_ts_nodegroup: + NODEGROUP_SYM opt_equal ulong_num + { + LEX *lex= Lex; + if (lex->alter_tablespace_info->nodegroup_id != UNDEF_NODEGROUP) + { + my_error(ER_TABLESPACE_OPTION_ONLY_ONCE,MYF(0),"NODEGROUP"); + YYABORT; + } + lex->alter_tablespace_info->nodegroup_id= $3; + }; + +opt_ts_comment: + COMMENT_SYM opt_equal TEXT_STRING_sys + { + LEX *lex= Lex; + if (lex->alter_tablespace_info->ts_comment != NULL) + { + my_error(ER_TABLESPACE_OPTION_ONLY_ONCE,MYF(0),"COMMENT"); + YYABORT; + } + lex->alter_tablespace_info->ts_comment= $3.str; + }; + +opt_ts_engine: + opt_storage ENGINE_SYM opt_equal storage_engines + { + LEX *lex= Lex; + if (lex->alter_tablespace_info->storage_engine != DB_TYPE_UNKNOWN) + { + my_error(ER_TABLESPACE_OPTION_ONLY_ONCE,MYF(0), + "STORAGE ENGINE"); + YYABORT; + } + lex->alter_tablespace_info->storage_engine= $4; + }; + +opt_ts_wait: + /* empty */ + | ts_wait + ; + +ts_wait: + WAIT_SYM + { + LEX *lex= Lex; + lex->alter_tablespace_info->wait_until_completed= TRUE; + } + | NO_WAIT_SYM + { + LEX *lex= Lex; + if (!(lex->alter_tablespace_info->wait_until_completed)) + { + my_error(ER_TABLESPACE_OPTION_ONLY_ONCE,MYF(0),"NO_WAIT"); + YYABORT; + } + lex->alter_tablespace_info->wait_until_completed= FALSE; + }; + +size_number: + ulong_num { $$= $1;} + | IDENT + { + ulonglong number, test_number; + uint text_shift_number= 0; + longlong prefix_number; + char *end_ptr; + char *start_ptr= $1.str; + uint str_len= strlen(start_ptr); + int error; + prefix_number= my_strtoll10(start_ptr, &end_ptr, &error); + if ((start_ptr + str_len - 1) == end_ptr) + { + switch (end_ptr[0]) + { + case 'g': + case 'G': + text_shift_number+=10; + case 'm': + case 'M': + text_shift_number+=10; + case 'k': + case 'K': + text_shift_number+=10; + break; + default: + { + my_error(ER_WRONG_SIZE_NUMBER, MYF(0)); + YYABORT; + } + } + if (prefix_number >> 31) + { + my_error(ER_SIZE_OVERFLOW_ERROR, MYF(0)); + YYABORT; + } + number= prefix_number << text_shift_number; + } + else + { + my_error(ER_WRONG_SIZE_NUMBER, MYF(0)); + YYABORT; + } + $$= number; + } + ; + +/* + End tablespace part +*/ create2: '(' create2a {} @@ -3205,6 +3608,9 @@ | INSERT_METHOD opt_equal merge_insert_types { Lex->create_info.merge_insert_method= $3; Lex->create_info.used_fields|= HA_CREATE_USED_INSERT_METHOD;} | DATA_SYM DIRECTORY_SYM opt_equal TEXT_STRING_sys { Lex->create_info.data_file_name= $4.str; Lex->create_info.used_fields|= HA_CREATE_USED_DATADIR; } | INDEX_SYM DIRECTORY_SYM opt_equal TEXT_STRING_sys { Lex->create_info.index_file_name= $4.str; Lex->create_info.used_fields|= HA_CREATE_USED_INDEXDIR; } + | TABLESPACE ident {Lex->create_info.tablespace= $2.str;} + | STORAGE_SYM DISK_SYM {Lex->create_info.store_on_disk= TRUE;} + | STORAGE_SYM MEMORY_SYM {Lex->create_info.store_on_disk= FALSE;} | CONNECTION_SYM opt_equal TEXT_STRING_sys { Lex->create_info.connect_string.str= $3.str; Lex->create_info.connect_string.length= $3.length; Lex->create_info.used_fields|= HA_CREATE_USED_CONNECTION; } ; @@ -3964,6 +4370,26 @@ } opt_view_list AS select_view_init check_option {} + | ALTER TABLESPACE alter_tablespace_info + { + LEX *lex= Lex; + lex->alter_tablespace_info->ts_cmd_type= ALTER_TABLESPACE; + } + | ALTER LOGFILE_SYM GROUP alter_logfile_group_info + { + LEX *lex= Lex; + lex->alter_tablespace_info->ts_cmd_type= ALTER_LOGFILE_GROUP; + } + | ALTER TABLESPACE change_tablespace_info + { + LEX *lex= Lex; + lex->alter_tablespace_info->ts_cmd_type= CHANGE_FILE_TABLESPACE; + } + | ALTER TABLESPACE change_tablespace_access + { + LEX *lex= Lex; + lex->alter_tablespace_info->ts_cmd_type= ALTER_ACCESS_MODE_TABLESPACE; + } ; ident_or_empty: @@ -6690,6 +7116,16 @@ LEX *lex= Lex; lex->sql_command= SQLCOM_DROP_TRIGGER; lex->spname= $3; + } + | DROP TABLESPACE tablespace_name opt_ts_engine opt_ts_wait + { + LEX *lex= Lex; + lex->alter_tablespace_info->ts_cmd_type= DROP_TABLESPACE; + } + | DROP LOGFILE_SYM GROUP logfile_group_name opt_ts_engine opt_ts_wait + { + LEX *lex= Lex; + lex->alter_tablespace_info->ts_cmd_type= DROP_LOGFILE_GROUP; } ; @@ -8200,6 +8636,7 @@ | ALGORITHM_SYM {} | ANY_SYM {} | AUTO_INC {} + | AUTOEXTEND_SIZE_SYM {} | AVG_ROW_LENGTH {} | AVG_SYM {} | BERKELEY_DB_SYM {} @@ -8223,6 +8660,7 @@ | CONSISTENT_SYM {} | CUBE_SYM {} | DATA_SYM {} + | DATAFILE_SYM {} | DATETIME {} | DATE_SYM {} | DAY_SYM {} @@ -8231,6 +8669,7 @@ | DES_KEY_FILE {} | DIRECTORY_SYM {} | DISCARD {} + | DISK_SYM {} | DUMPFILE {} | DUPLICATE_SYM {} | DYNAMIC_SYM {} @@ -8242,6 +8681,7 @@ | EVENTS_SYM {} | EXPANSION_SYM {} | EXTENDED_SYM {} + | EXTENT_SIZE_SYM {} | FAST_SYM {} | FOUND_SYM {} | DISABLE_SYM {} @@ -8263,6 +8703,7 @@ | INVOKER_SYM {} | IMPORT {} | INDEXES {} + | INITIAL_SIZE_SYM {} | ISOLATION {} | ISSUER_SYM {} | INNOBASE_SYM {} @@ -8276,6 +8717,7 @@ | LIST_SYM {} | LOCAL_SYM {} | LOCKS_SYM {} + | LOGFILE_SYM {} | LOGS_SYM {} | MAX_ROWS {} | MASTER_SYM {} @@ -8295,10 +8737,12 @@ | MASTER_SSL_KEY_SYM {} | MAX_CONNECTIONS_PER_HOUR {} | MAX_QUERIES_PER_HOUR {} + | MAX_SIZE_SYM {} | MAX_UPDATES_PER_HOUR {} | MAX_USER_CONNECTIONS_SYM {} | MAX_VALUE_SYM {} | MEDIUM_SYM {} + | MEMORY_SYM {} | MERGE_SYM {} | MICROSECOND_SYM {} | MIGRATE_SYM {} @@ -8318,7 +8762,8 @@ | NDBCLUSTER_SYM {} | NEXT_SYM {} | NEW_SYM {} - | NODEGROUP_SYM {} + | NO_WAIT_SYM {} + | NODEGROUP_SYM {} | NONE_SYM {} | NVARCHAR_SYM {} | OFFSET_SYM {} @@ -8345,6 +8790,8 @@ | RAID_STRIPED_SYM {} | RAID_TYPE {} | RECOVER_SYM {} + | REDO_BUFFER_SIZE_SYM {} + | REDOFILE_SYM {} | REDUNDANT_SYM {} | RELAY_LOG_FILE_SYM {} | RELAY_LOG_POS_SYM {} @@ -8401,6 +8848,8 @@ | FUNCTION_SYM {} | UNCOMMITTED_SYM {} | UNDEFINED_SYM {} + | UNDO_BUFFER_SIZE_SYM {} + | UNDOFILE_SYM {} | UNKNOWN_SYM {} | UNTIL_SYM {} | USER {} @@ -8409,6 +8858,7 @@ | VIEW_SYM {} | VALUE_SYM {} | WARNINGS {} + | WAIT_SYM {} | WEEK_SYM {} | WORK_SYM {} | X509_SYM {} --- 1.51/sql/share/errmsg.txt 2005-10-21 09:12:15 +02:00 +++ 1.52/sql/share/errmsg.txt 2005-10-25 10:09:00 +02:00 @@ -5543,3 +5543,17 @@ swe "Kan inte ta bort en partition när en främmande nyckel är definierad på tabellen" ER_PLUGIN_IS_NOT_LOADED eng "Plugin '%-.64s' is not loaded" +ER_TABLESPACE_OPTION_ONLY_ONCE + eng "It is not allowed to specify %s more than once" +ER_CREATE_TABLESPACE_FAILED + eng "Failed to create %s" +ER_DROP_TABLESPACE_FAILED + eng "Failed to drop %s" +ER_TABLESPACE_AUTO_EXTEND_ERROR + eng "The handler doesn't support autoextend of tablespaces" +ER_WRONG_SIZE_NUMBER + eng "A size parameter was incorrectly specified, either number or on the form 10M" +ER_SIZE_OVERFLOW_ERROR + eng "The size number was correct but we don't allow the digit part to be more than 2 billion" +ER_ALTER_TABLESPACE_FAILED + eng "Failed to alter: %s" --- New file --- +++ mysql-test/r/ndb_basic_disk.result 05/10/26 15:59:17 DROP TABLE IF EXISTS t1; CREATE LOGFILE GROUP lg1 ADD UNDOFILE 'undofile.dat' INITIAL_SIZE 16M UNDO_BUFFER_SIZE = 1M ENGINE=NDB; alter logfile group lg1 add undofile 'undofile02.dat' initial_size 4M engine=ndb; CREATE TABLESPACE ts1 ADD DATAFILE 'datafile.dat' USE LOGFILE GROUP lg1 INITIAL_SIZE 12M ENGINE NDB; alter tablespace ts1 add datafile 'datafile02.dat' initial_size 4M engine=ndb; CREATE TABLE t1 (pk1 int not null primary key, b int not null, c int not null) tablespace ts1 storage disk engine ndb; INSERT INTO t1 VALUES (0, 0, 0); SELECT * FROM t1; pk1 b c 0 0 0 INSERT INTO t1 VALUES (1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5), (6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10), (11,11,11),(12,12,12),(13,13,13),(14,14,14),(15,15,15), (16,16,16),(17,17,17),(18,18,18),(19,19,19),(20,20,20), (21,21,21),(22,22,22),(23,23,23),(24,24,24),(25,25,25), (26,26,26),(27,27,27),(28,28,28),(29,29,29),(30,30,30), (31,31,31),(32,32,32),(33,33,33),(34,34,34),(35,35,35), (36,36,36),(37,37,37),(38,38,38),(39,39,39),(40,40,40), (41,41,41),(42,42,42),(43,43,43),(44,44,44),(45,45,45), (46,46,46),(47,47,47),(48,48,48),(49,49,49),(50,50,50), (51,51,51),(52,52,52),(53,53,53),(54,54,54),(55,55,55), (56,56,56),(57,57,57),(58,58,58),(59,59,59),(60,60,60), (61,61,61),(62,62,62),(63,63,63),(64,64,64),(65,65,65), (66,66,66),(67,67,67),(68,68,68),(69,69,69),(70,70,70), (71,71,71),(72,72,72),(73,73,73),(74,74,74),(75,75,75), (76,76,76),(77,77,77),(78,78,78),(79,79,79),(80,80,80), (81,81,81),(82,82,82),(83,83,83),(84,84,84),(85,85,85), (86,86,86),(87,87,87),(88,88,88),(89,89,89),(90,90,90), (91,91,91),(92,92,92),(93,93,93),(94,94,94),(95,95,95), (96,96,96),(97,97,97),(98,98,98),(99,99,99),(100,100,100), (101,101,101),(102,102,102),(103,103,103),(104,104,104),(105,105,105), (106,106,106),(107,107,107),(108,108,108),(109,109,109),(110,110,110), (111,111,111),(112,112,112),(113,113,113),(114,114,114),(115,115,115), (116,116,116),(117,117,117),(118,118,118),(119,119,119),(120,120,120), (121,121,121),(122,122,122),(123,123,123),(124,124,124),(125,125,125), (126,126,126),(127,127,127),(128,128,128),(129,129,129),(130,130,130), (131,131,131),(132,132,132),(133,133,133),(134,134,134),(135,135,135), (136,136,136),(137,137,137),(138,138,138),(139,139,139),(140,140,140), (141,141,141),(142,142,142),(143,143,143),(144,144,144),(145,145,145), (146,146,146),(147,147,147),(148,148,148),(149,149,149),(150,150,150), (151,151,151),(152,152,152),(153,153,153),(154,154,154),(155,155,155), (156,156,156),(157,157,157),(158,158,158),(159,159,159),(160,160,160), (161,161,161),(162,162,162),(163,163,163),(164,164,164),(165,165,165), (166,166,166),(167,167,167),(168,168,168),(169,169,169),(170,170,170), (171,171,171),(172,172,172),(173,173,173),(174,174,174),(175,175,175), (176,176,176),(177,177,177),(178,178,178),(179,179,179),(180,180,180), (181,181,181),(182,182,182),(183,183,183),(184,184,184),(185,185,185), (186,186,186),(187,187,187),(188,188,188),(189,189,189),(190,190,190), (191,191,191),(192,192,192),(193,193,193),(194,194,194),(195,195,195), (196,196,196),(197,197,197),(198,198,198),(199,199,199),(200,200,200), (201,201,201),(202,202,202),(203,203,203),(204,204,204),(205,205,205), (206,206,206),(207,207,207),(208,208,208),(209,209,209),(210,210,210), (211,211,211),(212,212,212),(213,213,213),(214,214,214),(215,215,215), (216,216,216),(217,217,217),(218,218,218),(219,219,219),(220,220,220), (221,221,221),(222,222,222),(223,223,223),(224,224,224),(225,225,225), (226,226,226),(227,227,227),(228,228,228),(229,229,229),(230,230,230), (231,231,231),(232,232,232),(233,233,233),(234,234,234),(235,235,235), (236,236,236),(237,237,237),(238,238,238),(239,239,239),(240,240,240), (241,241,241),(242,242,242),(243,243,243),(244,244,244),(245,245,245), (246,246,246),(247,247,247),(248,248,248),(249,249,249),(250,250,250), (251,251,251),(252,252,252),(253,253,253),(254,254,254),(255,255,255), (256,256,256),(257,257,257),(258,258,258),(259,259,259),(260,260,260), (261,261,261),(262,262,262),(263,263,263),(264,264,264),(265,265,265), (266,266,266),(267,267,267),(268,268,268),(269,269,269),(270,270,270), (271,271,271),(272,272,272),(273,273,273),(274,274,274),(275,275,275), (276,276,276),(277,277,277),(278,278,278),(279,279,279),(280,280,280), (281,281,281),(282,282,282),(283,283,283),(284,284,284),(285,285,285), (286,286,286),(287,287,287),(288,288,288),(289,289,289),(290,290,290), (291,291,291),(292,292,292),(293,293,293),(294,294,294),(295,295,295), (296,296,296),(297,297,297),(298,298,298),(299,299,299),(300,300,300), (301,301,301),(302,302,302),(303,303,303),(304,304,304),(305,305,305), (306,306,306),(307,307,307),(308,308,308),(309,309,309),(310,310,310), (311,311,311),(312,312,312),(313,313,313),(314,314,314),(315,315,315), (316,316,316),(317,317,317),(318,318,318),(319,319,319),(320,320,320), (321,321,321),(322,322,322),(323,323,323),(324,324,324),(325,325,325), (326,326,326),(327,327,327),(328,328,328),(329,329,329),(330,330,330), (331,331,331),(332,332,332),(333,333,333),(334,334,334),(335,335,335), (336,336,336),(337,337,337),(338,338,338),(339,339,339),(340,340,340), (341,341,341),(342,342,342),(343,343,343),(344,344,344),(345,345,345), (346,346,346),(347,347,347),(348,348,348),(349,349,349),(350,350,350), (351,351,351),(352,352,352),(353,353,353),(354,354,354),(355,355,355), (356,356,356),(357,357,357),(358,358,358),(359,359,359),(360,360,360), (361,361,361),(362,362,362),(363,363,363),(364,364,364),(365,365,365), (366,366,366),(367,367,367),(368,368,368),(369,369,369),(370,370,370), (371,371,371),(372,372,372),(373,373,373),(374,374,374),(375,375,375), (376,376,376),(377,377,377),(378,378,378),(379,379,379),(380,380,380), (381,381,381),(382,382,382),(383,383,383),(384,384,384),(385,385,385), (386,386,386),(387,387,387),(388,388,388),(389,389,389),(390,390,390), (391,391,391),(392,392,392),(393,393,393),(394,394,394),(395,395,395), (396,396,396),(397,397,397),(398,398,398),(399,399,399),(400,400,400), (401,401,401),(402,402,402),(403,403,403),(404,404,404),(405,405,405), (406,406,406),(407,407,407),(408,408,408),(409,409,409),(410,410,410), (411,411,411),(412,412,412),(413,413,413),(414,414,414),(415,415,415), (416,416,416),(417,417,417),(418,418,418),(419,419,419),(420,420,420), (421,421,421),(422,422,422),(423,423,423),(424,424,424),(425,425,425), (426,426,426),(427,427,427),(428,428,428),(429,429,429),(430,430,430), (431,431,431),(432,432,432),(433,433,433),(434,434,434),(435,435,435), (436,436,436),(437,437,437),(438,438,438),(439,439,439),(440,440,440), (441,441,441),(442,442,442),(443,443,443),(444,444,444),(445,445,445), (446,446,446),(447,447,447),(448,448,448),(449,449,449),(450,450,450), (451,451,451),(452,452,452),(453,453,453),(454,454,454),(455,455,455), (456,456,456),(457,457,457),(458,458,458),(459,459,459),(460,460,460), (461,461,461),(462,462,462),(463,463,463),(464,464,464),(465,465,465), (466,466,466),(467,467,467),(468,468,468),(469,469,469),(470,470,470), (471,471,471),(472,472,472),(473,473,473),(474,474,474),(475,475,475), (476,476,476),(477,477,477),(478,478,478),(479,479,479),(480,480,480), (481,481,481),(482,482,482),(483,483,483),(484,484,484),(485,485,485), (486,486,486),(487,487,487),(488,488,488),(489,489,489),(490,490,490), (491,491,491),(492,492,492),(493,493,493),(494,494,494),(495,495,495), (496,496,496),(497,497,497),(498,498,498),(499,499,499),(500, 500, 500); SELECT COUNT(*) FROM t1; COUNT(*) 501 CREATE LOGFILE GROUP lg2 ADD UNDOFILE 'x.dat' INITIAL_SIZE 10y engine = ndb; ERROR HY000: A size parameter was incorrectly specified, either number or on the form 10M CREATE LOGFILE GROUP lg2 ADD UNDOFILE 'x.dat' INITIAL_SIZE 10MB engine=ndb; ERROR HY000: A size parameter was incorrectly specified, either number or on the form 10M CREATE LOGFILE GROUP lg2 ADD UNDOFILE 'x.dat' INITIAL_SIZE 10 MB engine=ndb; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MB engine=ndb' at line 3 CREATE LOGFILE GROUP lg2 ADD UNDOFILE 'x.dat' INITIAL_SIZE 10 M engine=ndb; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'M engine=ndb' at line 3 CREATE LOGFILE GROUP lg2 ADD UNDOFILE 'x.dat' INITIAL_SIZE 1000000000000K engine=ndb; ERROR HY000: The size number was correct but we don't allow the digit part to be more than 2 billion DROP TABLE t1; create table t1 (a int primary key, b char(4) not null, c char(4) not null, key(b)) tablespace ts1 storage disk engine ndb; insert into t1 values (1,'1','1'), (2,'2','2'), (3,'3','3'); begin; update t1 set b = '2' where a = 1; select b from t1 where a = 1; b 2 select * from t1 where a = 1; a b c 1 2 1 update t1 set c = '2' where a = 1; select b from t1 where a = 1; b 2 select * from t1 where a = 1; a b c 1 2 2 update t1 set b = '3' where a = 1; select b from t1 where a = 1; b 3 select * from t1 where a = 1; a b c 1 3 2 commit; select * from t1 order by 1; a b c 1 3 2 2 2 2 3 3 3 begin; update t1 set c = '3' where a = 1; select b from t1 where a = 1; b 3 select * from t1 where a = 1; a b c 1 3 3 update t1 set b = '4' where a = 1; select b from t1 where a = 1; b 4 select * from t1 where a = 1; a b c 1 4 3 update t1 set c = '4' where a = 1; select b from t1 where a = 1; b 4 select * from t1 where a = 1; a b c 1 4 4 commit; select * from t1 order by 1; a b c 1 4 4 2 2 2 3 3 3 update t1 set b = '5' where a = 1; select * from t1 order by 1; a b c 1 5 4 2 2 2 3 3 3 update t1 set b = '6' where b = '5'; select * from t1 order by 1; a b c 1 6 4 2 2 2 3 3 3 update t1 set b = '7' where c = '4'; select * from t1 order by 1; a b c 1 7 4 2 2 2 3 3 3 update t1 set c = '5' where a = 1; select * from t1 order by 1; a b c 1 7 5 2 2 2 3 3 3 update t1 set c = '6' where b = '7'; select * from t1 order by 1; a b c 1 7 6 2 2 2 3 3 3 update t1 set c = '7' where c = '6'; select * from t1 order by 1; a b c 1 7 7 2 2 2 3 3 3 drop table t1; create table t1 (a int primary key, b varchar(4) not null, c char(4) not null, key(b)) tablespace ts1 storage disk engine ndb; insert into t1 values (1,'1','1'), (2,'2','2'), (3,'3','3'); begin; update t1 set b = '2' where a = 1; select b from t1 where a = 1; b 2 select * from t1 where a = 1; a b c 1 2 1 update t1 set c = '2' where a = 1; select b from t1 where a = 1; b 2 select * from t1 where a = 1; a b c 1 2 2 update t1 set b = '3' where a = 1; select b from t1 where a = 1; b 3 select * from t1 where a = 1; a b c 1 3 2 commit; select * from t1 order by 1; a b c 1 3 2 2 2 2 3 3 3 begin; update t1 set c = '3' where a = 1; select b from t1 where a = 1; b 3 select * from t1 where a = 1; a b c 1 3 3 update t1 set b = '4' where a = 1; select b from t1 where a = 1; b 4 select * from t1 where a = 1; a b c 1 4 3 update t1 set c = '4' where a = 1; select b from t1 where a = 1; b 4 select * from t1 where a = 1; a b c 1 4 4 commit; select * from t1 order by 1; a b c 1 4 4 2 2 2 3 3 3 update t1 set b = '5' where a = 1; select * from t1 order by 1; a b c 1 5 4 2 2 2 3 3 3 update t1 set b = '6' where b = '5'; select * from t1 order by 1; a b c 1 6 4 2 2 2 3 3 3 update t1 set b = '7' where c = '4'; select * from t1 order by 1; a b c 1 7 4 2 2 2 3 3 3 update t1 set c = '5' where a = 1; select * from t1 order by 1; a b c 1 7 5 2 2 2 3 3 3 update t1 set c = '6' where b = '7'; select * from t1 order by 1; a b c 1 7 6 2 2 2 3 3 3 update t1 set c = '7' where c = '6'; select * from t1 order by 1; a b c 1 7 7 2 2 2 3 3 3 drop table t1; alter tablespace ts1 drop datafile 'datafile.dat' engine = ndb; alter tablespace ts1 drop datafile 'datafile02.dat' engine = ndb; drop tablespace ts1 engine = ndb; drop logfile group lg1 engine = ndb; --- New file --- +++ mysql-test/t/ndb_basic_disk.test 05/10/26 15:59:17 -- source include/have_ndb.inc --disable_warnings DROP TABLE IF EXISTS t1; --enable_warnings # # Basic test of disk tables for NDB # # # Start by creating a logfile group # CREATE LOGFILE GROUP lg1 ADD UNDOFILE 'undofile.dat' INITIAL_SIZE 16M UNDO_BUFFER_SIZE = 1M ENGINE=NDB; alter logfile group lg1 add undofile 'undofile02.dat' initial_size 4M engine=ndb; # # Create a tablespace connected to the logfile group # CREATE TABLESPACE ts1 ADD DATAFILE 'datafile.dat' USE LOGFILE GROUP lg1 INITIAL_SIZE 12M ENGINE NDB; alter tablespace ts1 add datafile 'datafile02.dat' initial_size 4M engine=ndb; # # Create a table using this tablespace # CREATE TABLE t1 (pk1 int not null primary key, b int not null, c int not null) tablespace ts1 storage disk engine ndb; INSERT INTO t1 VALUES (0, 0, 0); SELECT * FROM t1; INSERT INTO t1 VALUES (1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5), (6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10), (11,11,11),(12,12,12),(13,13,13),(14,14,14),(15,15,15), (16,16,16),(17,17,17),(18,18,18),(19,19,19),(20,20,20), (21,21,21),(22,22,22),(23,23,23),(24,24,24),(25,25,25), (26,26,26),(27,27,27),(28,28,28),(29,29,29),(30,30,30), (31,31,31),(32,32,32),(33,33,33),(34,34,34),(35,35,35), (36,36,36),(37,37,37),(38,38,38),(39,39,39),(40,40,40), (41,41,41),(42,42,42),(43,43,43),(44,44,44),(45,45,45), (46,46,46),(47,47,47),(48,48,48),(49,49,49),(50,50,50), (51,51,51),(52,52,52),(53,53,53),(54,54,54),(55,55,55), (56,56,56),(57,57,57),(58,58,58),(59,59,59),(60,60,60), (61,61,61),(62,62,62),(63,63,63),(64,64,64),(65,65,65), (66,66,66),(67,67,67),(68,68,68),(69,69,69),(70,70,70), (71,71,71),(72,72,72),(73,73,73),(74,74,74),(75,75,75), (76,76,76),(77,77,77),(78,78,78),(79,79,79),(80,80,80), (81,81,81),(82,82,82),(83,83,83),(84,84,84),(85,85,85), (86,86,86),(87,87,87),(88,88,88),(89,89,89),(90,90,90), (91,91,91),(92,92,92),(93,93,93),(94,94,94),(95,95,95), (96,96,96),(97,97,97),(98,98,98),(99,99,99),(100,100,100), (101,101,101),(102,102,102),(103,103,103),(104,104,104),(105,105,105), (106,106,106),(107,107,107),(108,108,108),(109,109,109),(110,110,110), (111,111,111),(112,112,112),(113,113,113),(114,114,114),(115,115,115), (116,116,116),(117,117,117),(118,118,118),(119,119,119),(120,120,120), (121,121,121),(122,122,122),(123,123,123),(124,124,124),(125,125,125), (126,126,126),(127,127,127),(128,128,128),(129,129,129),(130,130,130), (131,131,131),(132,132,132),(133,133,133),(134,134,134),(135,135,135), (136,136,136),(137,137,137),(138,138,138),(139,139,139),(140,140,140), (141,141,141),(142,142,142),(143,143,143),(144,144,144),(145,145,145), (146,146,146),(147,147,147),(148,148,148),(149,149,149),(150,150,150), (151,151,151),(152,152,152),(153,153,153),(154,154,154),(155,155,155), (156,156,156),(157,157,157),(158,158,158),(159,159,159),(160,160,160), (161,161,161),(162,162,162),(163,163,163),(164,164,164),(165,165,165), (166,166,166),(167,167,167),(168,168,168),(169,169,169),(170,170,170), (171,171,171),(172,172,172),(173,173,173),(174,174,174),(175,175,175), (176,176,176),(177,177,177),(178,178,178),(179,179,179),(180,180,180), (181,181,181),(182,182,182),(183,183,183),(184,184,184),(185,185,185), (186,186,186),(187,187,187),(188,188,188),(189,189,189),(190,190,190), (191,191,191),(192,192,192),(193,193,193),(194,194,194),(195,195,195), (196,196,196),(197,197,197),(198,198,198),(199,199,199),(200,200,200), (201,201,201),(202,202,202),(203,203,203),(204,204,204),(205,205,205), (206,206,206),(207,207,207),(208,208,208),(209,209,209),(210,210,210), (211,211,211),(212,212,212),(213,213,213),(214,214,214),(215,215,215), (216,216,216),(217,217,217),(218,218,218),(219,219,219),(220,220,220), (221,221,221),(222,222,222),(223,223,223),(224,224,224),(225,225,225), (226,226,226),(227,227,227),(228,228,228),(229,229,229),(230,230,230), (231,231,231),(232,232,232),(233,233,233),(234,234,234),(235,235,235), (236,236,236),(237,237,237),(238,238,238),(239,239,239),(240,240,240), (241,241,241),(242,242,242),(243,243,243),(244,244,244),(245,245,245), (246,246,246),(247,247,247),(248,248,248),(249,249,249),(250,250,250), (251,251,251),(252,252,252),(253,253,253),(254,254,254),(255,255,255), (256,256,256),(257,257,257),(258,258,258),(259,259,259),(260,260,260), (261,261,261),(262,262,262),(263,263,263),(264,264,264),(265,265,265), (266,266,266),(267,267,267),(268,268,268),(269,269,269),(270,270,270), (271,271,271),(272,272,272),(273,273,273),(274,274,274),(275,275,275), (276,276,276),(277,277,277),(278,278,278),(279,279,279),(280,280,280), (281,281,281),(282,282,282),(283,283,283),(284,284,284),(285,285,285), (286,286,286),(287,287,287),(288,288,288),(289,289,289),(290,290,290), (291,291,291),(292,292,292),(293,293,293),(294,294,294),(295,295,295), (296,296,296),(297,297,297),(298,298,298),(299,299,299),(300,300,300), (301,301,301),(302,302,302),(303,303,303),(304,304,304),(305,305,305), (306,306,306),(307,307,307),(308,308,308),(309,309,309),(310,310,310), (311,311,311),(312,312,312),(313,313,313),(314,314,314),(315,315,315), (316,316,316),(317,317,317),(318,318,318),(319,319,319),(320,320,320), (321,321,321),(322,322,322),(323,323,323),(324,324,324),(325,325,325), (326,326,326),(327,327,327),(328,328,328),(329,329,329),(330,330,330), (331,331,331),(332,332,332),(333,333,333),(334,334,334),(335,335,335), (336,336,336),(337,337,337),(338,338,338),(339,339,339),(340,340,340), (341,341,341),(342,342,342),(343,343,343),(344,344,344),(345,345,345), (346,346,346),(347,347,347),(348,348,348),(349,349,349),(350,350,350), (351,351,351),(352,352,352),(353,353,353),(354,354,354),(355,355,355), (356,356,356),(357,357,357),(358,358,358),(359,359,359),(360,360,360), (361,361,361),(362,362,362),(363,363,363),(364,364,364),(365,365,365), (366,366,366),(367,367,367),(368,368,368),(369,369,369),(370,370,370), (371,371,371),(372,372,372),(373,373,373),(374,374,374),(375,375,375), (376,376,376),(377,377,377),(378,378,378),(379,379,379),(380,380,380), (381,381,381),(382,382,382),(383,383,383),(384,384,384),(385,385,385), (386,386,386),(387,387,387),(388,388,388),(389,389,389),(390,390,390), (391,391,391),(392,392,392),(393,393,393),(394,394,394),(395,395,395), (396,396,396),(397,397,397),(398,398,398),(399,399,399),(400,400,400), (401,401,401),(402,402,402),(403,403,403),(404,404,404),(405,405,405), (406,406,406),(407,407,407),(408,408,408),(409,409,409),(410,410,410), (411,411,411),(412,412,412),(413,413,413),(414,414,414),(415,415,415), (416,416,416),(417,417,417),(418,418,418),(419,419,419),(420,420,420), (421,421,421),(422,422,422),(423,423,423),(424,424,424),(425,425,425), (426,426,426),(427,427,427),(428,428,428),(429,429,429),(430,430,430), (431,431,431),(432,432,432),(433,433,433),(434,434,434),(435,435,435), (436,436,436),(437,437,437),(438,438,438),(439,439,439),(440,440,440), (441,441,441),(442,442,442),(443,443,443),(444,444,444),(445,445,445), (446,446,446),(447,447,447),(448,448,448),(449,449,449),(450,450,450), (451,451,451),(452,452,452),(453,453,453),(454,454,454),(455,455,455), (456,456,456),(457,457,457),(458,458,458),(459,459,459),(460,460,460), (461,461,461),(462,462,462),(463,463,463),(464,464,464),(465,465,465), (466,466,466),(467,467,467),(468,468,468),(469,469,469),(470,470,470), (471,471,471),(472,472,472),(473,473,473),(474,474,474),(475,475,475), (476,476,476),(477,477,477),(478,478,478),(479,479,479),(480,480,480), (481,481,481),(482,482,482),(483,483,483),(484,484,484),(485,485,485), (486,486,486),(487,487,487),(488,488,488),(489,489,489),(490,490,490), (491,491,491),(492,492,492),(493,493,493),(494,494,494),(495,495,495), (496,496,496),(497,497,497),(498,498,498),(499,499,499),(500, 500, 500); SELECT COUNT(*) FROM t1; # # Test error cases with size numbers # --error ER_WRONG_SIZE_NUMBER CREATE LOGFILE GROUP lg2 ADD UNDOFILE 'x.dat' INITIAL_SIZE 10y engine = ndb; --error ER_WRONG_SIZE_NUMBER CREATE LOGFILE GROUP lg2 ADD UNDOFILE 'x.dat' INITIAL_SIZE 10MB engine=ndb; --error 1064 CREATE LOGFILE GROUP lg2 ADD UNDOFILE 'x.dat' INITIAL_SIZE 10 MB engine=ndb; --error 1064 CREATE LOGFILE GROUP lg2 ADD UNDOFILE 'x.dat' INITIAL_SIZE 10 M engine=ndb; --error ER_SIZE_OVERFLOW_ERROR CREATE LOGFILE GROUP lg2 ADD UNDOFILE 'x.dat' INITIAL_SIZE 1000000000000K engine=ndb; DROP TABLE t1; # Test update of mm/dd part create table t1 (a int primary key, b char(4) not null, c char(4) not null, key(b)) tablespace ts1 storage disk engine ndb; insert into t1 values (1,'1','1'), (2,'2','2'), (3,'3','3'); begin; update t1 set b = '2' where a = 1; select b from t1 where a = 1; select * from t1 where a = 1; update t1 set c = '2' where a = 1; select b from t1 where a = 1; select * from t1 where a = 1; update t1 set b = '3' where a = 1; select b from t1 where a = 1; select * from t1 where a = 1; commit; select * from t1 order by 1; begin; update t1 set c = '3' where a = 1; select b from t1 where a = 1; select * from t1 where a = 1; update t1 set b = '4' where a = 1; select b from t1 where a = 1; select * from t1 where a = 1; update t1 set c = '4' where a = 1; select b from t1 where a = 1; select * from t1 where a = 1; commit; select * from t1 order by 1; update t1 set b = '5' where a = 1; select * from t1 order by 1; update t1 set b = '6' where b = '5'; select * from t1 order by 1; update t1 set b = '7' where c = '4'; select * from t1 order by 1; update t1 set c = '5' where a = 1; select * from t1 order by 1; update t1 set c = '6' where b = '7'; select * from t1 order by 1; update t1 set c = '7' where c = '6'; select * from t1 order by 1; drop table t1; create table t1 (a int primary key, b varchar(4) not null, c char(4) not null, key(b)) tablespace ts1 storage disk engine ndb; insert into t1 values (1,'1','1'), (2,'2','2'), (3,'3','3'); begin; update t1 set b = '2' where a = 1; select b from t1 where a = 1; select * from t1 where a = 1; update t1 set c = '2' where a = 1; select b from t1 where a = 1; select * from t1 where a = 1; update t1 set b = '3' where a = 1; select b from t1 where a = 1; select * from t1 where a = 1; commit; select * from t1 order by 1; begin; update t1 set c = '3' where a = 1; select b from t1 where a = 1; select * from t1 where a = 1; update t1 set b = '4' where a = 1; select b from t1 where a = 1; select * from t1 where a = 1; update t1 set c = '4' where a = 1; select b from t1 where a = 1; select * from t1 where a = 1; commit; select * from t1 order by 1; update t1 set b = '5' where a = 1; select * from t1 order by 1; update t1 set b = '6' where b = '5'; select * from t1 order by 1; update t1 set b = '7' where c = '4'; select * from t1 order by 1; update t1 set c = '5' where a = 1; select * from t1 order by 1; update t1 set c = '6' where b = '7'; select * from t1 order by 1; update t1 set c = '7' where c = '6'; select * from t1 order by 1; drop table t1; alter tablespace ts1 drop datafile 'datafile.dat' engine = ndb; alter tablespace ts1 drop datafile 'datafile02.dat' engine = ndb; drop tablespace ts1 engine = ndb; drop logfile group lg1 engine = ndb; --- New file --- +++ sql/sql_tablespace.cc 05/10/26 15:59:18 /* Copyright (C) 2000-2004 MySQL AB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* drop and alter of tablespaces */ #include "mysql_priv.h" int mysql_alter_tablespace(st_alter_tablespace *ts_info) { int error; handler *file; DBUG_ENTER("mysql_alter_tablespace"); /* If the user haven't defined an engine, this will fallback to using the default storage engine. */ if (!(file= get_new_handler((TABLE*) 0, ts_info->storage_engine))) { my_error(ER_OUTOFMEMORY, MYF(0), 128); DBUG_RETURN(1); } if (error= file->alter_tablespace(ts_info)) { if (error == HA_ADMIN_NOT_IMPLEMENTED) { my_error(ER_CHECK_NOT_IMPLEMENTED, MYF(0), ""); } else if (error == 1) { DBUG_RETURN(1); } else { my_error(error, MYF(0)); } DBUG_RETURN(error); } DBUG_RETURN(FALSE); } --- 1.1/storage/ndb/src/kernel/blocks/pgman.cpp 2005-10-25 14:18:31 +02:00 +++ 1.2/storage/ndb/src/kernel/blocks/pgman.cpp 2005-10-25 10:09:00 +02:00 @@ -2198,10 +2198,8 @@ if (signal->theData[0] == 11003) { -#ifdef VM_TRACE verify_page_lists(); dump_page_lists(); -#endif } } --- 1.10/mysql-test/t/disabled.def 2005-10-25 14:18:27 +02:00 +++ 1.11/mysql-test/t/disabled.def 2005-10-13 10:52:12 +02:00 @@ -15,5 +15,3 @@ rpl_until : Unstable test case, bug#12429 rpl_deadlock : Unstable test case, bug#12429 kill : Unstable test case, bug#9712 -federated : bug#14288 - --- 1.221/sql/ha_ndbcluster.cc 2005-10-25 14:18:27 +02:00 +++ 1.222/sql/ha_ndbcluster.cc 2005-10-25 10:08:59 +02:00 @@ -3956,13 +3956,8 @@ field->pack_length())); if ((my_errno= create_ndb_column(col, field, info))) DBUG_RETURN(my_errno); - - if ( -#ifdef NDB_DISKDATA - info->store_on_disk || -#else - getenv("NDB_DEFAULT_DISK")) -#endif + + if (info->store_on_disk || getenv("NDB_DEFAULT_DISK")) col.setStorageType(NdbDictionary::Column::StorageTypeDisk); else col.setStorageType(NdbDictionary::Column::StorageTypeMemory); @@ -3982,14 +3977,11 @@ NdbDictionary::Column::StorageTypeMemory); } -#ifdef NDB_DISKDATA if (info->store_on_disk) if (info->tablespace) tab.setTablespace(info->tablespace); else tab.setTablespace("DEFAULT-TS"); -#endif - // No primary key, create shadow key as 64 bit, auto increment if (form->s->primary_key == MAX_KEY) { @@ -7983,7 +7975,6 @@ DBUG_RETURN(0); } -#ifdef NDB_DISKDATA bool set_up_tablespace(st_alter_tablespace *info, NdbDictionary::Tablespace *ndb_ts) { @@ -8200,7 +8191,6 @@ } DBUG_RETURN(FALSE); } -#endif /* Create a table in NDB Cluster --- 1.99/sql/ha_ndbcluster.h 2005-10-24 19:54:07 +02:00 +++ 1.100/sql/ha_ndbcluster.h 2005-10-25 10:08:59 +02:00 @@ -511,6 +511,7 @@ bool eq_range, bool sorted, byte* buf); int read_range_next(); + int alter_tablespace(st_alter_tablespace *info); /** * Multi range stuff --- 1.70/libmysqld/Makefile.am 2005-10-22 00:59:13 +02:00 +++ 1.71/libmysqld/Makefile.am 2005-10-25 10:08:59 +02:00 @@ -62,7 +62,8 @@ spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \ sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \ parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \ - rpl_filter.cc sql_partition.cc handlerton.cc sql_plugin.cc + rpl_filter.cc sql_partition.cc handlerton.cc sql_plugin.cc \ + sql_tablespace.cc libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) EXTRA_libmysqld_a_SOURCES = ha_innodb.cc ha_berkeley.cc ha_archive.cc \
| Thread | ||
|---|---|---|
| • bk commit into 5.1 tree (jonas:1.1942) | jonas | 26 Oct |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.874 sec. using MySQL 5.1.14-beta-log