mariadb

Tree: 74ac5b116f

Author	SHA1	Message	Date
marko	60ae240d23	branches/zip: Merge 2367:2384 from branches/5.1.	18 years ago
marko	15c670988f	branches/zip: Pass the tablespace flags correctly when creating or opening single-table tablespaces. This bug was reported by Sunny as Mantis issue #26. fil_space_create(), fil_create_new_single_table_tablespace(), fil_open_single_table_tablespace(), fsp_header_init_fields(): Add ut_a(flags != DICT_TF_COMPACT). dict_build_table_def_step(), row_import_tablespace_for_mysql(), row_truncate_table_for_mysql(): Pass correct flags to fil_create_new_single_table_tablespace() or fil_open_single_table_tablespace().	18 years ago
marko	bd8968b45d	branches/zip: dict_load_table(): Remove a redundant check for !flags. The function dict_sys_tables_get_flags() already ensures that the table flags are 0 unless ROW_FORMAT=COMPACT.	18 years ago
marko	77d8c98735	branches/zip: Rename ib_ulonglong to ib_uint64_t and ib_longlong to ib_int64_t.	18 years ago
marko	ebdb9daa9b	branches/zip: Merge 2295:2367 from branches/5.1.	18 years ago
marko	94c7701081	branches/zip: dict_table_print_low(): Print table->flags, so that users can create the table innodb_table_monitor and see in the error log which tables are incompatible with older versions of InnoDB.	18 years ago
marko	86361e032b	branches/zip: Implement the configuration parameter and settable global variable innodb_file_format. Implement file format version stamping of *.ibd files and SYS_TABLES.TYPE. This change breaks introduces an incompatible change for for compressed tables. We can do this, as we have not released yet. innodb-zip.test: Add tests for stricter KEY_BLOCK_SIZE and ROW_FORMAT checks. DICT_TF_COMPRESSED_MASK, DICT_TF_COMPRESSED_SHIFT: Replace with DICT_TF_ZSSIZE_MASK, DICT_TF_ZSSIZE_SHIFT. DICT_TF_FORMAT_MASK, DICT_TF_FORMAT_SHIFT, DICT_TF_FORMAT_51, DICT_TF_FORMAT_ZIP: File format version, stored in table->flags, in the .ibd file header, and in SYS_TABLES.TYPE. dict_create_sys_tables_tuple(): Write the table flags to SYS_TABLES.TYPE if the format is at least DICT_TF_FORMAT_ZIP. For old formats (DICT_TF_FORMAT_51), write DICT_TABLE_ORDINARY as the table type. DB_TABLE_ZIP_NO_IBD: Remove the error code. The error handling is done in ha_innodb.cc; as a failsafe measure, dict_build_table_def_step() will silently clear the compression and format flags instead of returning this error. dict_mem_table_create(): Assert that no extra bits are set in the flags. dict_sys_tables_get_zip_size(): Rename to dict_sys_tables_get_flags(). Check all flag bits, and return ULINT_UNDEFINED if the combination is unsupported. dict_boot(): Document the SYS_TABLES columns N_COLS and TYPE. dict_table_get_format(), dict_table_set_format(), dict_table_flags_to_zip_size(): New accessors to table->flags. dtuple_convert_big_rec(): Introduce the auxiliary variables local_len, local_prefix_len. Store a 768-byte prefix locally if the file format is less than DICT_TF_FORMAT_ZIP. dtuple_convert_back_big_rec(): Restore the columns. srv_file_format: New variable: innodb_file_format. fil_create_new_single_table_tablespace(): Replace the parameter zip_size with table->flags. fil_open_single_table_tablespace(): Replace the parameter zip_size_in_k with table->flags. Check the flags. fil_space_struct, fil_space_create(), fil_op_write_log(): Replace zip_size with flags. fil_node_open_file(): Note a TODO item for InnoDB Hot Backup. Check that the tablespace flags match. fil_space_get_zip_size(): Rename to fil_space_get_flags(). Add a wrapper for fil_space_get_zip_size(). fsp_header_get_flags(): New function. fsp_header_init_fields(): Replace zip_size with flags. FSP_SPACE_FLAGS: New name for the tablespace flags. This field used to be called FSP_PAGE_ZIP_SIZE, or FSP_LOWEST_NO_WRITE. It has always been written as 0 in MySQL/InnoDB versions 4.1 to 5.1. MLOG_ZIP_FILE_CREATE: Rename to MLOG_FILE_CREATE2. Add a 32-bit parameter for the tablespace flags. ha_innobase::create(): Check the table attributes ROW_FORMAT and KEY_BLOCK_SIZE. Issue errors if they are inappropriate, or warnings if the inherited attributes (in ALTER TABLE) will be ignored. PAGE_ZIP_MIN_SIZE_SHIFT: New constant: the 2-logarithm of PAGE_ZIP_MIN_SIZE.	18 years ago
marko	583ce8e896	branches/zip: Fix two more bogus MSVC C4090 warnings on constness differences (Warning C4090 is incorrectly issued when using Visual C++ .NET 2003, bug 101661, http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=101661) dict_table_find_equivalent_index(): Cast away constness in the mem_free() call. MSVC seems to think that an array of pointers to const data is const itself. UT_SORT_FUNCTION_BODY(): Cast away constness in the memcpy() call. MSVC seems to think that an array of pointers to const data is const itself.	18 years ago
marko	997de88df6	branches/zip: dict0dict.c: Add the #include "ha_prototypes.h" that should have been added in r2327.	18 years ago
vasil	26402257da	branches/zip: Use innobase_strcasecmp() insteaed of strcasecmp() in i_s.cc and get rid of strings.h (that file is not present on Windows). Move the prototype of innobase_strcasecmp() from ha_innodb.cc and dict0dict.c to ha_prototypes.h. Approved by: Heikki	18 years ago
marko	2c2b06ad75	branches/zip: Introduce UNIV_INTERN, a linkage specifier for InnoDB-global symbols. Use it for all definitions of non-static variables and functions. lexyy.c, make_flex.sh: Declare yylex as UNIV_INTERN, not static. It is referenced from pars0grm.c. Actually, according to nm .libs/ha_innodb.so\|grep -w '[ABCE-TVXYZ]' the following symbols are still global: * The vtable for class ha_innodb * pars0grm.c: The function yyparse() and the variables yychar, yylval, yynerrs The required changes to the Bison-generated file pars0grm.c will be addressed in a separate commit, which will add a script similar to make_flex.sh. The class ha_innodb is renamed from class ha_innobase by a #define. Thus, there will be no clash with the builtin InnoDB. However, there will be some overhead for invoking virtual methods of class ha_innodb. Ideas for making the vtable hidden are welcome. -fvisibility=hidden is not available in GCC 3.	18 years ago
marko	7d34b71cb9	branches/zip: Introduce the accessor function dict_index_is_ibuf() for determining if an index is the insert buffer B-tree.	18 years ago
marko	463141d149	branches/zip: Implement a limit for the size of undo log records. innodb-index.test: Add a test with a large number of externally stored columns. Check that there may not be prefix indexes on too many columns. dict_index_too_big_for_undo(): New function: Check if the undo log may overflow. dict_index_add_to_cache(): Return DB_SUCCESS or DB_TOO_BIG_RECORD. Postpone the creation and linking of some data structures, so that when dict_index_too_big_for_undo() holds, it will be easier to clean up. Check the return status in all callers.	18 years ago
marko	b33d8c401d	branches/zip: dict0dict.c: Minor cleanup. dict_index_copy(): Remove the prototype, because this static function will be defined before its first use. Add const qualifier to "table". dict_index_build_internal_clust(), dict_index_build_internal_non_clust(): Add const qualifier to "table". Correct the comment about setting indexed[].	18 years ago
marko	5a6cc2130c	branches/zip: dict_table_copy_types(): Initialize all fields to the SQL NULL value. Document this change in behaviour, and make all callers invoke the function right after dtuple_create(). dict_create_sys_fields_tuple(): Add a missing "break" statement to the loop that checks if there are any column prefixes in the index. row_get_prebuilt_insert_row(): Do not set the fields to the SQL NULL value, now that dict_table_copy_types() takes care of it.	18 years ago
marko	a7344bc8e1	branches/zip: Merge 2015:2093 from trunk.	18 years ago
marko	fe48c3662a	branches/zip: Return a meaningful error message when refusing to create a compressed table in the system tablespace. db0err.h: Introduce the error code DB_TABLE_ZIP_NO_IBD. Replace the #define directives with an enum, to ease future code merges. These error codes are never written out to files or displayed to the user. Thus they need not remain constant. dict_build_table_def_step(): Return DB_TABLE_ZIP_NO_IBD instead of DB_ERROR. create_table_def(): Report ER_ILLEGAL_HA_CREATE_OPTION "KEY_BLOCK_SIZE" when the table creation fails with DB_TABLE_ZIP_NO_IBD.	18 years ago
marko	c661970d75	branches/zip: Merge 1937:2015 from trunk.	18 years ago
marko	8ab05ab1d2	branches/zip: Minor cleanup of B-tree cursor operations. btr_pcur_get_rel_pos(): Add a const qualifier. btr_pcur_get_btr_cur(), btr_pcur_get_page_cur(): btr_cur_get_page_cur(): Define as const-preserving macros. btr_pcur_is_on_user_rec(), btr_pcur_is_after_last_on_page(), btr_pcur_is_before_first_on_page(): Remove the unused parameter mtr. Add a const qualifier. btr_pcur_move_to_next_on_page(), btr_pcur_move_to_prev_on_page(): Remove the unused parameter mtr. page_cur_search(): Add const qualifiers. page_cur_get_page(), page_cur_is_before_first(), page_cur_is_after_last(): Add debug assertions.	18 years ago
marko	db36183759	branches/zip: dict_truncate_index_tree(): When the index is not found in the data dictionary cache, do not create the index tree.	18 years ago
marko	8758ac866f	branches/zip: dict_index_copy_rec_order_prefix(): Add const qualifiers.	18 years ago
marko	23f80a6f54	branches/zip: Merge 1862:1894 from trunk, except 1866.	18 years ago
marko	d0631476b6	branches/zip: Minor cleanup. dict_find_index_by_max_id(): Rename this static function to its only caller, dict_table_get_index_by_max_id(). dict_table_get_index_by_max_id(): Copy the function comment from dict_find_index_by_max_id().	18 years ago
marko	5c9122e753	branches/zip: Add some const qualifiers or in/out comments to the dict_index_t* and dict_table_t* parameters of some functions.	18 years ago
marko	52a8928693	branches/zip: Simplify crash recovery in fast index creation. trx_t: Remove dict_undo_list and dict_redo_list. innobase_create_temporary_tablename(): Replace TEMP_TABLE_PREFIX with a table name suffix "#1" or "#2". In this way, the user can restore precious data, should anything go wrong. It is possible to reach an inconsistent state, because the creation, deletion and renaming of single-table tablespaces are not transactional. ut_print_namel(), fil_make_ibd_name(), innobase_rename_table(): Remove the special treatment of TEMP_TABLE_PREFIX. Introduce TEMP_INDEX_PREFIX == 0xff for temporary indexes. This byte cannot occur in index names since MySQL 4.1. However, it might have been possible to use this byte in MySQL 4.0. recv_recovery_from_checkpoint_finish(): Call the new function row_merge_drop_temp_indexes(), to drop all indexes whose name starts with the byte 0xff. row_merge_rename_indexes(): Renamed from row_merge_rename_index(). Remove the parameter "index". row_drop_table_for_mysql(): Unconditionally call trx_commit_for_mysql(). row_drop_table_for_mysql_no_commit(): Correct the function commit, based on the corrected comment of row_drop_table_for_mysql(). Rely on table->to_be_dropped instead of TEMP_TABLE_PREFIX. ha_innobase::add_index(): Simplify the control flow.	18 years ago
marko	37e720811b	branches/zip: Enclose the definition of dict_index_t::trx_id in #ifdef ROW_MERGE_IS_INDEX_USABLE, to avoid growing the memory footprint until MySQL implements and calls the virtual method handler::is_index_available() or something equivalent.	18 years ago
marko	64dfb280d2	branches/zip: Remove some checks if an index or a table is a temporary one created in fast index creation. dict_load_indexes(): Always complain if the first index is not clustered. lock_table_enqueue_waiting(): Always complain about lock waits in a dictionary operation. row_merge_rename_tables(): Add an assertion that dict_sys->mutex is being held. row_undo_mod_del_unmark_sec_and_undo_update(): Make the test about temporary indexes more readable. row_create_table_for_mysql(): Do not retry creating a temporary table in fast index creation. Orphaned temporary tables will have to be dropped in crash recovery.	18 years ago
marko	d1be7f720e	branches/zip: Remove trx->sync_cb. Call dict_rename_indexes() directly from ha_innobase::add_index(). dict_rename_indexes(): Remove the redundant parameter commit_flag.	18 years ago
marko	2d8aa553da	branches/zip: dict_foreign_eval_sql(): Print foreign->id as a table name (in the database.id format). This should have been changed in r1570.	18 years ago
marko	a2565facc8	branches/zip: dict_table_rename_in_cache(): Improve the diagnostic printout for the error cases. Avoid copying the old table->name; the string will remain valid in table->heap.	18 years ago
marko	12ed008d04	branches/zip: Use mem_heap_zalloc() when initializing dict_table_t, dict_index_t, and dict_foreign_t.	18 years ago
marko	e1c3be5e03	branches/zip: Rename mem_heap_calloc() and mem_calloc() to mem_heap_zalloc() and mem_zalloc(), because calloc() in the C runtime library takes two size parameters, not one. mem_heap_zalloc(): Add debug assertions. Document that the return value is never NULL.	19 years ago
marko	31ba41df9f	branches/zip: Remove redundant type casts. Change the parameter type of ut_strcmp() from const void* to const char*.	19 years ago
marko	11665dc32a	branches/zip: Ensure that the dictionary updates are atomic by keeping the data dictionary locked across the operations. dict_table_decrement_handle_count(), row_prebuilt_free(): Add the flag dict_locked, to prevent the acquisition of dict_sys->mutex. innobase_rename_table(): Rename commit_flag to lock_and_commit, and do not acquire dict_sys->mutex or flush the log unless the flag is set. Remove bogus comment about utility threads, because the threads will be waken up by the upper-level function ha_innobase::rename_table(). ha_innobase::add_index(): After creating a primary key, hold dict_sys->mutex across all dictionary operations.	19 years ago
marko	d662c3c656	branches/zip: Merge 1575:1664 from trunk.	19 years ago
marko	54113d6d9f	branches/zip: HASH_SEARCH(): Add the parameter TYPE, for the type of DATA. C++ requires explicit type casts when converting from void, and .ic files are now inlined in ha_innodb.cc. fil_space_get_by_id(), fil_space_get_by_name(): New inline functions, to replace occurrences of the HASH_SEARCH() macro in fil0fil.c. This should improve readability.	19 years ago
marko	5288876e23	branches/zip: Make merge sort handle externally stored columns. Some things still fail in innodb-index.test, and there seems to be a race condition (data dictionary lock wait) when running with --valgrind. dfield_t: Add an "external storage" flag, dfield->ext. dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null(): New functions. dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments. data_write_sql_null(): Use memset(). big_rec_field_t: Replace byte* data with const void* data. ut_ulint_sort(): Remove. upd_field_t: Remove extern_storage. upd_node_t: Replace ext_vec, n_ext_vec with n_ext. row_merge_copy_blobs(): New function. row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing foreign key checks during fast index creation or when inserting into secondary indexes. btr_page_insert_fits(): Add const qualifiers. btr_cur_add_ext(), upd_ext_vec_contains(): Remove. dfield_print_also_hex(), dfield_print(): Replace if...else if with switch. Observe dfield_is_ext().	19 years ago
marko	f29addba49	branches/zip: Enable calls to inlined InnoDB functions in ha_innodb.cc, now that all of InnoDB code is built from a single Makefile and it should not be possible to build the modules with mutually incompatible options. #define INSIDE_HA_INNOBASE_CC: Remove. srv_sizeof_trx_t_in_ha_innodb_cc: Remove. dict_table_get_low_noninlined(): Remove. This function was unused. Remove all _noninline functions. Remove the _noninline suffix from all function calls in ha_innodb.cc.	19 years ago
marko	71e8cceeab	branches/zip: Define mem_heap_calloc() and mem_calloc(). Use them when allocating zero-filled memory.	19 years ago
marko	5ab4cfd4ad	branches/zip: Initialize some uninitialized variables in order to avoid comparing uninitialized values. dict_mem_table_create(): Initialize table->version_number. ins_node_create(): Initialize node->table_version_number. row_create_prebuilt(): Initialize all fields. Initialize most fields by memset(), so that any fields that are added will be initialized automatically.	19 years ago
marko	c09c8a27d1	branches/zip: Document dict_rename_indexes() better.	19 years ago
marko	7fbc04fcdc	branches/zip: Merge 1533:1553 from trunk.	19 years ago
marko	d75e64f98a	branches/zip: Merge 1493:1533 from trunk. Make use of UT_BITS_IN_BYTES().	19 years ago
marko	a8b6524b14	branches/zip: Use ut_dulint_zero and ut_dulint_is_zero whenever possible.	19 years ago
marko	e7284367dc	branches/zip: Merge revisions 1402:1493 from trunk. Remove mysql.patch, because the configuration parameter interface has changed.	19 years ago
marko	b90b4f59b4	branches/zip: Make use of the function dict_index_is_unique().	19 years ago
marko	a47b9e64e6	branches/zip: Merge branches/fast-index-creation -r1413. Fix some bugs. The tests innodb and innodb-index fail, but that might be due to an old MySQL source tree being used.	19 years ago
marko	33c1125d55	branches/zip: Merge revisions 1322:1402 from trunk.	19 years ago
marko	3423833053	branches/zip: Make TRUNCATE TABLE recreate single-table tablespaces. dict_truncate_index_tree(): Add the parameter space for specifying the new tablespace identifier of a single-table tablespace that has been recreated. When SYS_INDEXES.PAGE_NO == FIL_NULL, do not abort but create the index tree. fil_discard_tablespace(): Pass the return code from fil_delete_tablespace(). row_truncate_table_for_mysql(): Attempt to discard and recreate single-table tablespaces. Reassign the tablespace identifier both in the data dictionary (SYS_TABLES and SYS_INDEXES) and in the data dictionary cache.	19 years ago
marko	2908fa4c16	branches/zip: dict_mem_table_free(): Remove the call ut_free(table->col_names) that should have been removed in r1264, which made the temporary memory allocations use a caller-supplied heap.	19 years ago

1 2 3

102 Commits (74ac5b116f19c6fe1085a0f91d7e84888f93f87b)