Commit graph

75 commits

Author SHA1 Message Date
marko
c1d4665514 branches/innodb+: Merge revisions 2867:2986 from branches/zip:
------------------------------------------------------------------------
  r2867 | marko | 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) | 2 lines

  branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866.
  ------------------------------------------------------------------------
  r2869 | vasil | 2008-10-24 11:14:16 +0300 (Fri, 24 Oct 2008) | 4 lines

  branches/zip:

  White space cleanup in ChangeLog
  ------------------------------------------------------------------------
  r2870 | vasil | 2008-10-24 13:36:14 +0300 (Fri, 24 Oct 2008) | 8 lines

  branches/zip:

  Remove a statement that causes the innodb-index test to fail.

  The change in behavior was introduced in MySQL BZR-r2738.

  Suggested by:	Marko
  ------------------------------------------------------------------------
  r2871 | vasil | 2008-10-24 13:48:38 +0300 (Fri, 24 Oct 2008) | 5 lines

  branches/zip:

  Adjust mysql-test/patches/innodb-index.diff after the change to
  mysql-test/innodb-index.(test|result) in r2870.
  ------------------------------------------------------------------------
  r2878 | calvin | 2008-10-27 11:05:42 +0200 (Mon, 27 Oct 2008) | 8 lines

  branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory
  overrun of the buffer being freed with 64-bit Microsoft Visual C++.

  The changed file:

  CMakeLists.txt: Removing Win64 compiler optimizations for all 
  innodb/mem/* files.
  ------------------------------------------------------------------------
  r2884 | vasil | 2008-10-27 11:48:46 +0200 (Mon, 27 Oct 2008) | 7 lines

  branches/zip:

  ChangeLog:

  Add entry for the fix of Bug#19424 InnoDB: Possibly a memory overrun of
  the buffer being freed (64-bit Visual C)
  ------------------------------------------------------------------------
  r2886 | calvin | 2008-10-27 22:39:11 +0200 (Mon, 27 Oct 2008) | 8 lines

  branches/zip: This patch is to solve the issue that file handles can
  not cross DLL/EXE boundaries on Windows. In builtin InnoDB, it makes
  call to MySQL server for creating tmp files. innobase_mysql_tmpfile
  is now rewritten for the plugin. 

  rb://5

  Approved by:	Marko
  ------------------------------------------------------------------------
  r2887 | calvin | 2008-10-27 22:48:29 +0200 (Mon, 27 Oct 2008) | 44 lines

  branches/zip: implement the delayloading of externals for the plugin
  on Windows, which includes:

   * Load mysqld.map and insert all symbol/address pairs into hash for
     quick access
   * Resolves all external data variables. The delayloading mechanism
     in MSVC does not support automatic imports of data variables.
     A workaround is to explicitly handle the data import using the delay
     loader during the initialization of the plugin.
   * Resolves all external functions during run-time, by implementing
     the delayed loading helper function delayLoadHelper2, which is
     called by run-time as well as HrLoadAllImportsForDll. 

  The delay loader reuses the hash implementation in InnoDB. The normal
  hash_create (in hash0hash.c) creates hash tables in buffer pool. But
  the delay loader is invoked before the engine is initialized, and 
  buffer pools are not ready yet. Instead, the delay loader has its own
  implementation of hash_create() and hash_table_free(), called
  wdl_hash_create() and wdl_hash_table_free().

  This patch should be used with other two patches in order to build
  a dynamically linked plugin on Windows:
   * patch for tmpfile functions (r2886)
   * patch for "build" files (to be committed)

  The list of file changed:

  handler/handler0vars.h: new file, defines a list of external data
  variables (no external functions).

  handler/win_delay_loader.cc: new file, the implementation of the delay
  loader for Windows plugin.

  handler/ha_innodb.cc: add a header file, and changes for copying the
  system variables.

  handler/handler0alter.cc: add a header file

  handler/i_s.cc: add a header file

  rb://27

  Reviewed by:	Sunny, Marko
  Approved by:	Sunny
  ------------------------------------------------------------------------
  r2888 | calvin | 2008-10-28 01:51:49 +0200 (Tue, 28 Oct 2008) | 25 lines

  branches/zip: for building dynamic plugin on Windows, ha_innodb.dll,
  when INNODB_DYNAMIC_PLUGIN is specified.

  The changes are:

  CMakeLists.txt: add project ha_innodb for dynamic plugin on Windows.
  ha_innodb depends on project mysqld.

  ha_innodb.def: a new file with standard exports for a dynamic plugin.

  Two new files will be added:
   * sql/mysqld.def:	.def file for 32-bit compiler
   * sql/mysqld_x64.def:	.def file for x64 compiler

  It is also required to apply a patch to the MySQL source tree. The 
  patch is described in win-plugin/README:

  win-plugin/win-plugin.diff - a patch to be applied to MySQL source
  tree. When applied, the following files will be modified:
   * CMakeLists.txt:	add INNODB_DYNAMIC_PLUGIN and _USE_32BIT_TIME_T
   * sql/CMakeLists.txt:	add mysqld.def or mysqld_x64.def for mysqld
   * win/configure.js:	add INNODB_DYNAMIC_PLUGIN
   * win/build-vs71.bat:	provide an option to specify CMAKE_BUILD_TYPE
   * win/build-vs8.bat:	provide an option to specify CMAKE_BUILD_TYPE
   * win/build-vs8_x64.bat: provide an option to specify CMAKE_BUILD_TYPE
  ------------------------------------------------------------------------
  r2894 | marko | 2008-10-28 08:36:39 +0200 (Tue, 28 Oct 2008) | 4 lines

  branches/zip: dict_str_starts_with_keyword(): Removed this unused function.

  Spotted by Sunny.
  ------------------------------------------------------------------------
  r2895 | vasil | 2008-10-28 08:40:45 +0200 (Tue, 28 Oct 2008) | 6 lines

  branches/zip:

  ChangeLog:

  add entry for the Windows plugin.
  ------------------------------------------------------------------------
  r2917 | marko | 2008-10-28 23:53:23 +0200 (Tue, 28 Oct 2008) | 3 lines

  branches/zip: innodb_plugin_init(): Do not copy session variables,
  even when the variable is a global variable in the built-in InnoDB.
  ------------------------------------------------------------------------
  r2918 | calvin | 2008-10-29 00:08:11 +0200 (Wed, 29 Oct 2008) | 2 lines

  branches/zip: fix a problem introduced in r2917 - dyn is not
  initialized. Move the check into for().
  ------------------------------------------------------------------------
  r2922 | calvin | 2008-10-29 08:29:01 +0200 (Wed, 29 Oct 2008) | 16 lines

  branches/zip: fix issue #102 - Windows plugin: resolve dbug functions
  during run-time.

  Implement wrapper functions in the plugin. The plugin will get the
  function entries from mysqld.exe during the init, and invoke the
  corresponding functions (in mysqld.exe). The list of functions are:

  	_db_pargs_
  	_db_doprnt_
  	_db_enter_
  	_db_return_
  	_db_dump_

  rb://38

  Approved by:	Marko
  ------------------------------------------------------------------------
  r2923 | marko | 2008-10-29 09:52:30 +0200 (Wed, 29 Oct 2008) | 1 line

  branches/zip: ChangeLog: Mention Bug #27276.
  ------------------------------------------------------------------------
  r2925 | calvin | 2008-10-29 10:09:41 +0200 (Wed, 29 Oct 2008) | 16 lines

  branches/zip: change function names in sql/mysqld.def in order
  to work with 5.1.29-rc.

  In 5.1.29, the following function names are changed:
    _hash_init
    hash_free
    hash_search
    hash_delete

  changed to
    _my_hash_init
    my_hash_free
    my_hash_search
    my_hash_delete

  Approved by:	Marko (on IM)
  ------------------------------------------------------------------------
  r2927 | marko | 2008-10-29 11:43:23 +0200 (Wed, 29 Oct 2008) | 4 lines

  branches/zip: ha_innodb.cc: Make some functions static, so that they will
  not be compiled as weak global symbols.  These functions must not be
  redirected to the built-in InnoDB.
  ------------------------------------------------------------------------
  r2928 | michael | 2008-10-29 19:20:10 +0200 (Wed, 29 Oct 2008) | 4 lines

  Remove unnecessary assert

  Approved by: Heikki, over IM
  ------------------------------------------------------------------------
  r2930 | marko | 2008-10-29 21:39:24 +0200 (Wed, 29 Oct 2008) | 33 lines

  branches/zip: Merge revisions 2854:2929 from branches/5.1,
  except r2924, which was merged from branches/zip r2866 to branches/5.1
  and except r2879 which was merged separately by Calvin:

    ------------------------------------------------------------------------
    r2902 | vasil | 2008-10-28 12:10:25 +0200 (Tue, 28 Oct 2008) | 10 lines

    branches/5.1:

    Fix Bug#38189 innodb_stats_on_metadata missing

    Make the variable innodb_stats_on_metadata visible to the users and
    also settable at runtime. Previously it was only "visible" as a command
    line startup option to mysqld.

    Approved by:    Marko (https://svn.innodb.com/rb/r/36)
    ------------------------------------------------------------------------
    r2929 | marko | 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) | 13 lines

    branches/5.1: dtype_get_sql_null_size(): return the correct storage
    size of a SQL NULL column. (Bug #40369)

    When MySQL Bug #20877 was fixed in r834, this function was
    accidentally modified to return 0 or 1. Apparently, the only impact of
    this bug is that fixed-length columns cannot be updated in-place from
    or to SQL NULL, even in ROW_FORMAT=REDUNDANT.  After this fix,
    fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant
    storage size as they should, no matter if NULL or non-NULL.  The bug
    caused fixed-length NULL columns to occupy 1 byte.

    rb://37 approved by Heikki over IM.
    ------------------------------------------------------------------------

  ------------------------------------------------------------------------
  r2931 | vasil | 2008-10-29 22:10:40 +0200 (Wed, 29 Oct 2008) | 4 lines

  branches/zip:

  Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1.
  ------------------------------------------------------------------------
  r2935 | vasil | 2008-10-30 12:17:23 +0200 (Thu, 30 Oct 2008) | 17 lines

  branches/zip:

  Fix "Bug#40360 Binlog related errors with binlog off" in InnoDB code in order
  to have a Bug#40360-free InnoDB Plugin 1.0.2.

  The fix does check whether binary logging is enabled in MySQL by accessing the
  opt_bin_log global variable that is defined in sql/mysqld.cc.

  In case MySQL does develop another solution to this via Bug#40360 then we can
  revert this patch (except the mysql-tests).

  The windows-plugin part of this fix will be committed as a separate commit to
  ease eventual merge into branches/5.1 [note from the future: the separate
  commit went into r2936].

  Approved by:	Marko (https://svn.innodb.com/rb/r/39)
  ------------------------------------------------------------------------
  r2936 | vasil | 2008-10-30 12:24:09 +0200 (Thu, 30 Oct 2008) | 7 lines

  branches/zip:

  Followup to r2935: add the Windows Delay Loader stuff for the MySQL
  variable that we are accessing. If someday we have another solution for
  Bug#40360 Binlog related errors with binlog off
  then this should also be reverted.
  ------------------------------------------------------------------------
  r2937 | vasil | 2008-10-30 12:28:47 +0200 (Thu, 30 Oct 2008) | 4 lines

  branches/zip:

  Add ChangeLog entry for Bug#40360 Binlog related errors with binlog off
  ------------------------------------------------------------------------
  r2938 | vasil | 2008-10-30 12:33:28 +0200 (Thu, 30 Oct 2008) | 5 lines

  branches/zip:

  Non-functional change: convert handler/handler0vars.h and
  handler/win_delay_loader.cc from \r\n (dos) to \n (unix) line terminators.
  ------------------------------------------------------------------------
  r2939 | marko | 2008-10-30 12:38:18 +0200 (Thu, 30 Oct 2008) | 2 lines

  branches/zip: Set svn:eol-style native on some recently added text files.
  ------------------------------------------------------------------------
  r2940 | marko | 2008-10-30 12:46:21 +0200 (Thu, 30 Oct 2008) | 1 line

  branches/zip: ChangeLog, ha_innodb.def: Set svn:eol-style native
  ------------------------------------------------------------------------
  r2941 | vasil | 2008-10-30 19:34:27 +0200 (Thu, 30 Oct 2008) | 4 lines

  branches/zip:

  Increment the InnoDB Plugin version from 1.0.1 to 1.0.2.
  ------------------------------------------------------------------------
  r2943 | sunny | 2008-10-31 09:40:29 +0200 (Fri, 31 Oct 2008) | 15 lines

  branches/zip: 
    1. We add a vector of locks to trx_t. This array contains the autoinc
    locks granted to a transaction. There is one per table.

    2. We enforce releasing of these locks in the reverse order from the
    one in which they are acquired. The assumption is that since the
    AUTOINC locks are statement level locks. Nested statements introduced
    by triggers are stacked it should hold.

  There was some cleanup done to the vector code too by adding const and
  some new functions. Rename dict_table_t::auto_inc_lock to autoinc_lock.

  Fix Bug#26316 Triggers create duplicate entries on auto-increment columns
  rb://22
  ------------------------------------------------------------------------
  r2944 | vasil | 2008-10-31 09:44:16 +0200 (Fri, 31 Oct 2008) | 12 lines

  branches/zip:

  Revert our temporary fix for "Bug#40360 Binlog related errors with binlog off"
  (r2935, r2936) and deploy MySQL's one, but put the function
  mysql_bin_log_is_engaged() inside mysql_addons.cc instead of in mysql's log.cc
  and use a different name for it so there is no collision when MySQL adds this
  function in log.cc.

  [note from the future: the windows part of this patch went into r2947]

  Approved by:	Marko (https://svn.innodb.com/rb/r/41/)
  ------------------------------------------------------------------------
  r2945 | sunny | 2008-10-31 09:44:45 +0200 (Fri, 31 Oct 2008) | 2 lines

  branches/zip: Update ChangeLog with r2943 info.
  ------------------------------------------------------------------------
  r2946 | marko | 2008-10-31 10:18:47 +0200 (Fri, 31 Oct 2008) | 2 lines

  branches/zip: Revert the unintended change to univ.i that was made in r2943.
  ------------------------------------------------------------------------
  r2947 | calvin | 2008-10-31 10:38:26 +0200 (Fri, 31 Oct 2008) | 6 lines

  branches/zip: Windows plugin part of r2944

  r2944 has reference to mysql_bin_log.is_open(), which is new in InnoDB.
  Add two new entries and remove one duplicate in mysqld.def & 
  mysqld_x64.def.
  ------------------------------------------------------------------------
  r2948 | vasil | 2008-10-31 11:39:07 +0200 (Fri, 31 Oct 2008) | 9 lines

  branches/zip:

  Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static
  InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl

  Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag.

  Approved by:	Marko (https://svn.innodb.com/rb/r/42/)
  ------------------------------------------------------------------------
  r2949 | vasil | 2008-10-31 11:47:56 +0200 (Fri, 31 Oct 2008) | 4 lines

  branches/zip:

  White-space cleanup in ChangeLog.
  ------------------------------------------------------------------------
  r2951 | marko | 2008-10-31 14:21:43 +0200 (Fri, 31 Oct 2008) | 4 lines

  branches/zip: scripts/install_innodb_plugins_win.sql: New script,
  for installing the InnoDB plugins in Windows.  Copied from
  scripts/install_innodb_plugins.sql.
  ------------------------------------------------------------------------
  r2954 | calvin | 2008-11-04 09:15:26 +0200 (Tue, 04 Nov 2008) | 8 lines

  branches/zip: ignore the failure when builtin_innobase_plugin is not
  available.

  External variable builtin_innobase_plugin is not available when mysqld
  does not have a builtin InnoDB. The init of the Windows plugin should
  not fail in this case. 

  Approved by:	Marko (on IM)
  ------------------------------------------------------------------------
  r2955 | calvin | 2008-11-04 12:43:14 +0200 (Tue, 04 Nov 2008) | 11 lines

  branches/zip: windows plugin - fix references to array variables.

  This problem surfaced when running new test innodb_bug40360.test. Both
  tx_isolation_names and binlog_format_names are name arrays, and
  should be defined as wdl_tx_isolation_names and wdl_binlog_format_names,
  not *wdl_tx_isolation_names and *wdl_binlog_format_names.

  Another array variable is all_charsets, which is already correctly
  defined.

  Approved by:	Marko (on IM)
  ------------------------------------------------------------------------
  r2986 | marko | 2008-11-11 09:28:37 +0200 (Tue, 11 Nov 2008) | 11 lines

  branches/zip: ha_innobase::create(): Remove the dependences on
  DICT_TF_ZSSIZE_MAX, so that the code can be compiled with a different
  uncompressed page size by redefining UNIV_PAGE_SIZE_SHIFT in univ.i.
  Currently, the allowed values are 12, 13, or 14 (4k, 8k, 16k).

  Make the default compressed page size half the uncompressed page size.
  The previous default was 8 kilobytes, which is the same when compiling
  with the default 16k uncompressed page size.

  rb://50 approved by Pekka Lampio and Sunny Bains.
  ------------------------------------------------------------------------
2008-11-11 10:21:16 +00:00
marko
ddf1769c42 branches/innodb+: Merge revisions 2678:2774 from branches/zip. 2008-10-11 19:37:21 +00:00
marko
c5fa1c20be branches/innodb+: Merge 2637:2660 from branches/zip. 2008-09-22 07:57:34 +00:00
sunny
4b06a4b130 branches/innodb+: Merge revisions 2460:2579 from branches/zip
The followin mysql-tests failed (and they are known to fail):
main.information_schema        	[ fail ]
main.innodb_file_per_table_basic[ fail ]
main.type_bit_innodb           	[ fail ]

Tested against : MYSQL_SERVER_VERSION  "5.1.28"
2008-08-09 00:15:46 +00:00
inaam
a48c8a2878 branches/innodb+: Merge revisions 2344:2454 from branches/zip 2008-05-14 15:43:19 +00:00
marko
409fcc594f branches/zip: Minor fixes.
lock_rec_restore_from_page_infimum(): Correct the comment of the parameter rec.

lock_sec_rec_read_check_and_lock(): Add the debug assertion
ut_ad(mode == LOCK_X || mode == LOCK_S).
2008-02-18 15:45:17 +00:00
marko
0b23b9baf2 branches/zip: Minor improvements.
lock_update_delete(): Add the debug assertion ut_ad(page == page_align(rec)).

lock_rec_insert_check_and_lock(): Determine next_rec_heap_no before
acquiring the kernel mutex.  Require the table to be at least S-locked
in fast index creation.
2008-02-18 09:53:08 +00:00
marko
e357b22e04 branches/zip: lock0lock.c: Minor cleanup.
lock_rec_get_first(): Use a simple for loop.

lock_rec_copy(): Use mem_heap_dup().

lock_rec_find_similar_on_page(): Add const qualifier to trx.

lock_move_rec_list_end(), lock_move_rec_list_start(): Simplify the
memcmp() assertion on ROW_FORMAT=REDUNDANT records.
2008-02-15 14:16:27 +00:00
marko
be47135f4b branches/zip: lock_rec_other_has_expl_req(): Minor cleanup: add const
qualifier to parameter, and fix the formatting of a comment.
2008-02-15 13:03:12 +00:00
marko
348dd7400e branches/zip: lock_rec_add_to_queue(): Improve the debug diagnostics.
Make it easier to display the violating lock request in a debugger.
2008-02-15 11:38:21 +00:00
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.
2008-02-06 14:17:36 +00:00
marko
64c95da886 branches/zip: Fast index creation: Release locks on system tables before
creating indexes.  Lock the user table inside the user transaction.

enum trx_dict_op: Remove TRX_OP_INDEX_MAY_WAIT.

ha_innobase::add_index(): Lock the user tables within prebuilt->trx.
Commit the data dictionary transaction before creating indexes.

ha_innobase::final_drop_index(): Lock the user table within prebuilt->trx.
2008-01-25 14:26:07 +00:00
vasil
74ac13f05e branches/zip:
Change the output format of transaction ids from 2 32bit numbers separated
by space to a single hex number.

Suggested by:	Heikki
Approved by:	Heikki
2007-12-20 14:08:16 +00:00
marko
d0d9299177 branches/zip: Fast index creation: Remove the ROW_PREBUILT_OBSOLETE nonsense.
Active transactions must not switch table or index definitions on the fly,
for several reasons, including the following:

 * copied indexes do not carry any history or locking information;
   that is, rollbacks, read views, and record locking would be broken

 * huge potential for race conditions, inconsistent reads and writes,
   loss of data, and corruption

Instead of trying to track down if the table was changed during a transaction,
acquire appropriate locks that protect the creation and dropping of indexes.

innodb-index.test: Test the locking of CREATE INDEX and DROP INDEX.  Test
that consistent reads work across dropped indexes.

lock_rec_insert_check_and_lock(): Relax the lock_table_has() assertion.
When inserting a record into an index, the table must be at least IX-locked.
However, when an index is being created, an IS-lock on the table is
sufficient.

row_merge_lock_table(): Add the parameter enum lock_mode mode, which must
be LOCK_X or LOCK_S.

row_merge_drop_table(): Assert that n_mysql_handles_opened == 0.
Unconditionally drop the table.

ha_innobase::add_index(): Acquire an X or S lock on the table, as appropriate.
After acquiring an X lock, assert that n_mysql_handles_opened == 1.
Remove the comments about dropping tables in the background.

ha_innobase::final_drop_index(): Acquire an X lock on the table.

dict_table_t: Remove version_number, to_be_dropped, and prebuilts.
ins_node_t: Remove table_version_number.

enum lock_mode: Move the definition from lock0lock.h to lock0types.h.

ROW_PREBUILT_OBSOLETE, row_update_prebuilt(), row_prebuilt_table_obsolete():
Remove.

row_prebuilt_t: Remove the declaration from row0types.h.

row_drop_table_for_mysql_no_commit(): Always print a warning if a table
was added to the background drop queue.
2007-12-17 15:49:59 +00:00
marko
da28dd3cb0 branches/zip: lock_rec_insert_check_and_lock(): Use the cached value
of thr_get_trx(thr).
2007-12-17 14:11:19 +00:00
vasil
0845bd2d23 branches/zip:
Non-functional change:
 
Move the prototypes of
innobase_mysql_prepare_print_arbitrary_thd() and
innobase_mysql_end_print_arbitrary_thd() from lock0lock.c to
ha_prototypes.h

Suggested by:	Marko
Approved by:	Marko
2007-12-16 16:13:53 +00:00
marko
95f1b15a5f branches/zip: lock_sec_rec_some_has_impl_off_kernel(): Make the function
static.  It is only called from lock0lock.c.
2007-11-27 09:20:40 +00:00
vasil
976c562f81 branches/zip:
Make lock_get_type_str() to also indicate if it is a gap lock.
 
Suggested by:	Heikki
Approved by:	Marko
2007-10-25 11:21:11 +00:00
marko
cd247197cd branches/zip: lock_sec_rec_read_check_and_lock(): Correct a typo in comment. 2007-10-22 07:49:54 +00:00
marko
1561b414e1 branches/zip: Introduce two new dictionary operation modes for transactions.
enum trx_dict_op: dictionary operation modes

trx_get_dict_operation(), trx_set_dict_operation(): Accessors for
trx->dict_operation.

lock_table_enqueue_waiting(), lock_rec_enqueue_waiting(): Do not complain
about lock waits if the dictionary mode is TRX_DICT_OP_INDEX_MAY_WAIT.

row_merge_lock_table(): Remove the work-around for avoiding the warning
in lock_table_enqueue_waiting().

trx_undo_mark_as_dict_operation(): Do not write trx->table_id to the
undo log unless the dict_operation is TRX_DICT_OP_TABLE.

ha_innobase::add_index(): Set the dict_operation mode initially to
TRX_DICT_OP_INDEX_MAY_WAIT, then lock the table exclusively, and set the
mode to TRX_DICT_OP_INDEX, and optionally to TRX_DICT_OP_TABLE when
creating a temporary table.
2007-10-19 10:52:25 +00:00
marko
d967aaa65b branches/zip: Remove const warnings reported by GCC 4.2.1.
page_cur_set_before_first(), page_cur_set_after_last(),
page_cur_position(): Add const qualifiers to buf_block_t and rec.
A better solution would be to define a const_page_cur_t and a
set of accessors, but it would lead to severe code duplication.

page_rec_get_n_recs_before(): Add const qualifiers.

page_dir_get_nth_slot(): Define as a const-preserving macro.

page_dir_slot_get_rec(), page_dir_slot_get_n_owned(),
page_dir_find_owner_slot(), page_check_dir(): Add const qualifiers.

page_rec_get_next_low(): Add const qualifiers.

page_rec_get_next_const(), page_rec_get_prev_const(): New functions,
based on the const-less page_rec_get_next() and page_rec_get_prev().

page_cur_get_page(), page_cur_get_block(), page_cur_get_page_zip(),
page_cur_get_rec(): Define as const-preserving macros.

page_cur_try_search_shortcut(), page_cur_search_with_match():
Add const qualifiers.

buf_page_get_mutex(): Add a const qualifier to buf_page_t*.

rec_get_next_ptr_const(): Const variant of rec_get_next_ptr().
2007-10-18 07:12:05 +00:00
marko
6557ba5342 branches/zip: Silence most GCC 4.2.1 warnings about const pointers.
For some reason, GCC 4.2.1 ignores casts (for removing constness)
in calls to inline functions.

page_align(), ut_align_down(): Make the parameter const void*, but still
return a non-const pointer.  This is ugly, but these functions cannot be
replaced with a const-preserving macro in a portable way, given that
the pointer argument is not always pointing to bytes.

buf_block_get_page_zip(): Implement as a const-preserving macro.

buf_frame_get_page_zip(), buf_block_align(): Add const qualifiers.

lock_rec_get_prev(): Silence GCC 4.2.1 warnings.

mlog_write_initial_log_record(), mlog_write_initial_log_record_fast(),
mtr_memo_contains(): Add const qualifier to the pointer.

page_header_get_ptr(): Rewrite as page_header_get_offs(), and
implement as a macro that calls this function.
2007-10-03 12:22:29 +00:00
marko
3d57033064 branches/zip: Optimize buf_page_try_get_func().
buf_block_hash_get(): New function, similar to buf_page_hash_get().

buf_page_get_block(): Remove the const qualifiers.  This is a low-level
function, and the operations on block->mutex are non-const.

buf_page_try_get_func(): Implement with lower-level predicates, somewhat
similar to buf_page_get_known_nowait().

lock_rec_print(): Remove the unused variable zip_size and the
call to fil_space_get_zip_size().  Adapt to buf_page_try_get() returning
a const pointer.
2007-10-01 07:32:45 +00:00
marko
22b01120b8 branches/zip: Define the macro rec_offs_init() and use it for initializing
offsets_[] arrays, as suggested by Vasil.

rec_offs_set_n_alloc(): Declare as a public function.  Assert that
n_alloc > REC_OFFS_HEADER_SIZE.

rec_offs_get_n_alloc(): Assert that n_alloc > REC_OFFS_HEADER_SIZE.
2007-09-28 07:05:57 +00:00
vasil
e05b8e86b9 branches/zip:
Move part of the code from lock_rec_print() in a separate function
buf_page_try_get() because the same functionality is needed in
INFORMATION SCHEMA code.

Approved by:	Heikki
2007-09-27 14:35:18 +00:00
vasil
511cab191a branches/zip:
Add auxiliary function lock_rec_get_index() to retrieve the index on
which the lock is.

Approved by:	Heikki
2007-09-27 13:54:21 +00:00
marko
63805a307b branches/zip: lock_rec_enqueue_waiting(): When a record lock wait occurs
in a dictionary operation, display also the name of the index.
2007-09-05 08:57:59 +00:00
vasil
ad9b8c6a48 lock_get_type() needs to be accessed outside of the lock module, but it
is inline and accesses lock_t members.

As advised by Marko rename lock_get_type() to lock_get_type_low() and
create a public non-inline function lock_get_type() which calls
lock_get_type_low().

Approved by:	Marko
2007-09-04 07:54:29 +00:00
vasil
ccb384e236 Add functions that retrieve some lock_t characteristics, needed in
INFORMATION_SCHEMA implementation:

lock_get_trx_id()
lock_get_mode_str()
lock_get_type_str()
lock_get_table_id()
lock_get_table_name()
lock_rec_get_index_name()
lock_rec_get_space_id()
lock_rec_get_page_no()

Approved by:	Marko
2007-09-03 12:16:11 +00:00
marko
faec4797c8 branches/zip: Merge 1664:1783 from trunk. 2007-08-30 09:21:25 +00:00
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.
2007-08-29 08:45:34 +00:00
marko
d662c3c656 branches/zip: Merge 1575:1664 from trunk. 2007-08-01 11:18:43 +00:00
marko
7827b838e6 branches/zip: lock_rec_print(), lock_table_print(), lock_rec_get_prev():
Add a const qualifier to lock_t*.
2007-08-01 07:49:43 +00:00
marko
d75e64f98a branches/zip: Merge 1493:1533 from trunk.
Make use of UT_BITS_IN_BYTES().
2007-05-29 08:48:16 +00:00
marko
a8b6524b14 branches/zip: Use ut_dulint_zero and ut_dulint_is_zero whenever possible. 2007-05-18 11:01:58 +00:00
marko
e7284367dc branches/zip: Merge revisions 1402:1493 from trunk.
Remove mysql.patch, because the configuration parameter interface has changed.
2007-05-14 09:07:15 +00:00
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.
2007-04-04 11:05:33 +00:00
marko
33c1125d55 branches/zip: Merge revisions 1322:1402 from trunk. 2007-04-02 05:39:41 +00:00
marko
35f83441a0 branches/zip: Simplify lock_mode_stronger_or_eq() and lock_mode_compatible()
and introduce enum lock_mode.

lock_mode_stronger_or_eq(), lock_mode_compatible(): Replace if-then-else
chain with a bitwise and against a constant.
2007-02-01 20:56:23 +00:00
marko
46e544a082 branches/zip: lock0lock.c: Minor cleanup.
Replace some while loops with do..while or for loops.

lock_move_rec_list_start(): Replace 2 with PAGE_HEAP_NO_USER_LOW.
2007-01-23 14:10:48 +00:00
marko
14ed331720 branches/zip: lock0lock.c: Add UNIV_UNLIKELY hints to LOCK_WAIT checks.
Declare some local variables in narrower scope.

lock_move_rec_list_start(): Check for orphan locks #ifdef UNIV_DEBUG
2007-01-23 10:02:02 +00:00
marko
cdcffb28ca branches/zip: lock_move_reorganize_page(): Move the UNIV_DEBUG check for
orphaned locks outside the "for" loop.  This mistake was made in r1252.
2007-01-22 15:46:27 +00:00
marko
2ac3bfd883 branches/zip: lock_move_reorganize_page(): Clean up the code a little,
and implement UNIV_DEBUG diagnostics for orphaned locks.
2007-01-22 14:44:34 +00:00
marko
d48c3388df branches/zip: Enclose ut_ad(lock_rec_validate_page(...))
inside #ifdef UNIV_DEBUG_LOCK_VALIDATE.

lock_rec_validate_page(): Assert that page_find_rec_with_heap_no()
returns non-NULL.
2007-01-22 10:24:21 +00:00
marko
ecff2cb1bb branches/zip: Enable assertions on ut_ad(lock_rec_validate_page()).
lock_rec_get_nth_bit(), lock_rec_set_nth_bit(), lock_rec_reset_nth_bit(),
lock_rec_copy(): Simplify the code.
2007-01-22 08:48:00 +00:00
marko
d8536b0de8 branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG. 2007-01-18 18:29:12 +00:00
marko
c712838401 branches/zip: Merge revisions 1165:1206 from trunk. 2007-01-18 12:58:39 +00:00
marko
fff329cd3d branches/zip: Remove the fil_space_get_zip_size() call from
buf_page_get_gen().  This saves one mutex operation per block request.

buf_page_get_gen(), various macros and functions: Add parameter zip_size.

btr_node_ptr_get_child(): Add parameter index.

fil_space_get_latch(): Add optional output parameter zip_size.

fil_space_get_zip_size(): Return 0 for space id==0, because the
system tablespace is never compressed.

fsp_header_init(): Remove the parameter zip_size.

ibuf_free_excess_pages(): Remove the parameter zip_size.

trx_rseg_t, trx_undo_t: Add field zip_size.

xdes_lst_get_next(): Remove, unused.
2007-01-18 09:59:00 +00:00
marko
4574bdda81 branches/zip: Merge revisions 968:1009 from trunk. 2006-11-10 11:15:59 +00:00
marko
58e3096324 branches/zip: lock0lock.c: Add const qualifiers to and assertions
about block->frame matching rec.
2006-10-26 13:05:45 +00:00