Commits · 49b527ab648cfbcf30528b4bcfce113f1ab4e335 · Kirill Smelkov / mariadb

21 Nov, 2007 1 commit

Bug #25146: Some warnings/errors not shown when using --show-warnings · 49b527ab

unknown authored Nov 20, 2007

In several cases, an error when processing the query would cause mysql to
return to the top level without printing warnings.  Fix is to always
print any available warnings before returning to the top level.


client/mysql.cc:
  In com_go(), ensure that warnings are printed even if an error
  occurred when processing the query.  Before this patch, an error
  in several places would return to the top level without printing
  associated warnings.
  
  Attempt to avoid printing the warning, though, if it's a duplicate
  of mysql_error() for the connection handle.
mysql-test/r/mysql.result:
  Add test for bug 25146
mysql-test/t/mysql.test:
  Add test for bug 25146

49b527ab

07 Nov, 2007 1 commit

Cast away compiler warning on Windows. · 8680f86e

unknown authored Nov 07, 2007


storage/innobase/handler/ha_innodb.cc:
  Cast away a compiler warning; some functions return ulong or ulint for
  errors, and some use int.  Let's hope these all fit in an int.

8680f86e

06 Nov, 2007 2 commits

Apply snapshot innodb-5.1-ss2034 · bdffce05

unknown authored Nov 06, 2007

The following bugs are fixed:

Bug #31860: Server crashes after inserting into InnoDB table with auto_increment column
  In the Bug 16979 fix there was an erroneous assertion that
  autoincrement columns can't contain negative values. With the fix, the
  autoincrement table counter is set to 0 if the maximum value read from
  the autoinc column index is negative.


mysql-test/r/innodb.result:
  Apply snapshot innodb-5.1-ss2034
  
  Revision r2034:
  Fix for Bug# 31860, in the Bug 16979 fix there was an erroneous assertion that
  autoincrement columns can't contain negative values. With the fix, the
  autoincrement table counter is set to 0 if the maximum value read from
  the autoinc column index is negative.
  
  Add test for the bug fix but the test is not really useful as the server
  needs to be restarted half way through the test. It has been added for 
  reference only.
mysql-test/t/innodb.test:
  Apply snapshot innodb-5.1-ss2034
  
  Revision r2034:
  Fix for Bug# 31860, in the Bug 16979 fix there was an erroneous assertion that
  autoincrement columns can't contain negative values. With the fix, the
  autoincrement table counter is set to 0 if the maximum value read from
  the autoinc column index is negative.
  
  Add test for the bug fix but the test is not really useful as the server
  needs to be restarted half way through the test. It has been added for 
  reference only.
storage/innobase/handler/ha_innodb.cc:
  Apply snapshot innodb-5.1-ss2034
  
  Revision r2017:
  Use "InnoDB:" prefix in error messages.
  
  
  Revision r2018:
  Remove ut_print_timestamp(), this should have been removed when the following
  changes were made by MySQL.
  
  	ChangeSet@1.1810.467.1  2005-08-11 19:19:20+03:00  jani@omakaista.fi
  
  Fix error message so that it conforms to "  InnoDB: Error: ...".
storage/innobase/include/univ.i:
  Apply snapshot innodb-5.1-ss2034
  
  Revision r2015:
  UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Remove warnings on 64-bit systems.
storage/innobase/row/row0sel.c:
  Apply snapshot innodb-5.1-ss2034
  
  Revision r2034:
  Fix for Bug# 31860, in the Bug 16979 fix there was an erroneous assertion that
  autoincrement columns can't contain negative values. With the fix, the
  autoincrement table counter is set to 0 if the maximum value read from
  the autoinc column index is negative.
  
  Add test for the bug fix but the test is not really useful as the server
  needs to be restarted half way through the test. It has been added for 
  reference only.
storage/innobase/sync/sync0sync.c:
  Apply snapshot innodb-5.1-ss2034
  
  Revision r2017:
  Use "InnoDB:" prefix in error messages.

bdffce05

Apply snapshot innodb-5.1-ss1989 · e2513bf0

unknown authored Nov 06, 2007

Fixes the following bugs:

Bug #30706: SQL thread on slave is allowed to block client queries when slave load is high
Add (innodb|innobase|srv)_replication_delay MySQL config parameter.

Bug #30888: Innodb table + stored procedure + row deletion = server crash
While adding code for the low level read of the AUTOINC value from the index,
the case for MEDIUM ints which are 3 bytes was missed triggering an
assertion.

Bug #30907: Regression: "--innodb_autoinc_lock_mode=0" (off) not same as older releases
We don't rely on *first_value to be 0 when checking whether
get_auto_increment() has been invoked for the first time in a multi-row
INSERT. We instead use trx_t::n_autoinc_rows. Initialize trx::n_autoinc_rows
inside ha_innobase::start_stmt() too.

Bug #31444: "InnoDB: Error: MySQL is freeing a thd" in innodb_mysql.test
ha_innobase::external_lock(): Update prebuilt->mysql_has_locked and
trx->n_mysql_tables_in_use only after row_lock_table_for_mysql() returns
DB_SUCCESS. A timeout on LOCK TABLES would lead to an inconsistent state,
which would cause trx_free() to print a warning.

Bug #31494: innodb + 5.1 + read committed crash, assertion
Set an error code when a deadlock occurs in semi-consistent read.

mysql-test/r/innodb.result:
Apply snapshot innodb-5.1-ss1989

Also, a test is moved into the new innodb_autoinc_lock_mode_zero
test, because it depends on a non-default setting for a read-only
variable.

Revision r1821:
Merge a change from MySQL AB:

ChangeSet@1.2536.50.1 2007-08-02 12:45:56-07:00 igor@mysql.com

Fixed bug#28404.
This patch adds cost estimation for the queries with ORDER BY / GROUP BY
and LIMIT.
If there was a ref/range access to the table whose rows were required
to be ordered in the result set the optimizer always employed this access
though a scan by a different index that was compatible with the required
order could be cheaper to produce the first L rows of the result set.
Now for such queries the optimizer makes a choice between the cheapest
ref/range accesses not compatible with the given order and index scans
compatible with it.

innodb.result: Adjusted results for test cases affected fy the fix for
bug #28404.

Revision r1781:
Fix a test case that was broken after Bug#16979 fix. See r1645 and r1735.
The variable used in the tests below was introduced in r1735.

Revision r1792:
innodb.result: Revert r1655, which should have been reverted as part of r1781.

Revision r1843:
Add test for Bug# 21409, the actual bug was fixed in r1334.
mysql-test/t/innodb.test:
Apply snapshot innodb-5.1-ss1989

Also, a test is moved into the new innodb_autoinc_lock_mode_zero
test, because it depends on a non-default setting for a read-only
variable.

Revision r1781:
Fix a test case that was broken after Bug#16979 fix. See r1645 and r1735.
The variable used in the tests below was introduced in r1735.

Revision r1843:
Add test for Bug# 21409, the actual bug was fixed in r1334.
storage/innobase/buf/buf0lru.c:
Apply snapshot innodb-5.1-ss1989

Revision r1819:
Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.

UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
area is defined.

UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.

UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
writable before declaring it free (unwritable). This replaces UNIV_MEM_FREE()
in many places.

mem_init_buf(): Check that the memory is writable, and declare it undefined.

mem_erase_buf(): Check that the memory is writable, and declare it freed.
storage/innobase/dict/dict0dict.c:
Apply snapshot innodb-5.1-ss1989

Revision r1894:
Add debug lock checks to autoinc functions. Add lock guards around an
invocation of dict_table_autoinc_initialize().
storage/innobase/dict/dict0load.c:
Apply snapshot innodb-5.1-ss1989

Revision r1974:
Prevent loading of tables that have unsupported features most notably
FTS indexes.
storage/innobase/handler/ha_innodb.cc:
Apply snapshot innodb-5.1-ss1989

Revision r1850:
Implement this feature request:
http://bugs.mysql.com/30706

* Add a function that returns the number of microseconds since
epoch - ut_time_us().

* Add (innodb|innobase|srv)_replication_delay MySQL config parameter.

* Add UT_WAIT_FOR() macro that waits for a specified condition to occur
until a timeout elapses.

* Using all of the above, handle the replication thread specially in
srv_conc_enter_innodb().

Approved by: Heikki

Revision r1887:
Merge changes from MySQL AB:

ChangeSet@1.2528.115.25 2007-08-27 18:18:14-06:00 tsmith@hindu.god

Fix some Windows compiler warnings.

dict0mem.c: Fix compiler warning with a cast.

ha_innodb.cc: Change type to fix a compiler warning.

Revision r1809:
ha_innobase::external_lock(): Update prebuilt->mysql_has_locked and
trx->n_mysql_tables_in_use only after row_lock_table_for_mysql()
returns DB_SUCCESS. A timeout on LOCK TABLES would lead to an
inconsistent state, which would cause trx_free() to print a warning.

This was later reported as Bug #31444.

Revision r1833:
Add /*== ... === */ decoration that was missing around some auto-inc functions.
Add a missing comment, fix the length of a decoration. Initialize the *value
out parameter in ha_innobase::innobase_get_auto_increment().

Revision r1866:
Revert r1850 as MySQL did not approve the addition.

log for r1850:

Implement this feature request:
http://bugs.mysql.com/30706

* Add a function that returns the number of microseconds since
epoch - ut_time_us().

* Add (innodb|innobase|srv)_replication_delay MySQL config parameter.

* Add UT_WAIT_FOR() macro that waits for a specified condition to occur
until a timeout elapses.

* Using all of the above, handle the replication thread specially in
srv_conc_enter_innodb().

Revision r1846:
Add config option innodb_use_adaptive_hash_indexes to enable/disable
adaptive hash indexes. It is enabled by default (no change in default
behavior).

Approved by: Marko

Revision r1974:
Prevent loading of tables that have unsupported features most notably
FTS indexes.

Revision r1829:
Add assertion to enforce check of an implicit invariant and add comment about
retry of autoinc read semantics. We always reread the table's autoinc counter
after attempting to initialize it i.e., we want to guarantee that a read of
autoinc valus that is returned to the caller is always covered by the
AUTOINC locking mechanism.

Revision r1787:
Move the prototype of innobase_print_identifier() from ut0ut.c to
ha_prototypes.h. Enclose the definitions in ha_prototypes.h in
#ifndef UNIV_HOTBACKUP.

Revision r1888:
Merge a change from MySQL AB:

ChangeSet@1.2528.115.30 2007-08-28 10:17:15-06:00 tsmith@hindu.god

Fix another compiler warning on Windows in InnoDB.

ha_innodb.cc:

Fix compiler warning: ::get_auto_increment takes a ulonglong
for nb_desired_values, but InnoDB's trx struct stores it as
a ulint (unsigned long). Probably harmless, as a single
statement won't be asking for more than 2^32 rows.

Revision r1987:
Bug fix: The problem was that when write_row() attempted to update the max
autoinc value, and if it was rolled back because of a deadlock, the
deadlock error (transaction rollback) was not being propagated back to MySQL.

Revision r1889:
Merge a change from MySQL AB:

ChangeSet@1.2560 2007-09-21 10:15:16+02:00 gkodinov@local

ha_innodb.cc: fixed type conversion warnings revealed by bug 30639

Revision r1989:
Suppress printing of deadlock errors while reading the autoinc value.
DB_DEADLOCK errors are part of normal processing and excessive printing
of these error messages could be disconcerting for users.

Revision r1828:
Fix two bugs:

Bug# 30907: We don't rely on *first_value to be 0 when checking whether
get_auto_increment() has been invoked for the first time in a multi-row
INSERT. We instead use trx_t::n_autoinc_rows. Initialize trx::n_autoinc_rows
inside ha_innobase::start_stmt() too.

Bug# 30888: While adding code for the low level read of the AUTOINC value
from the index, the case for MEDIUM ints which are 3 bytes was missed
triggering an assertion.
storage/innobase/handler/ha_innodb.h:
Apply snapshot innodb-5.1-ss1989

Revision r1844:
Remove the prototypes of some functions inside #if 0.
The function definitions were removed in r1746.
storage/innobase/ibuf/ibuf0ibuf.c:
Apply snapshot innodb-5.1-ss1989

Revision r1965:
ibuf_insert_to_index_page(): Fix typos in diagnostic output.
storage/innobase/include/db0err.h:
Apply snapshot innodb-5.1-ss1989

Revision r1974:
Prevent loading of tables that have unsupported features most notably
FTS indexes.
storage/innobase/include/ha_prototypes.h:
Apply snapshot innodb-5.1-ss1989

Revision r1787:
Move the prototype of innobase_print_identifier() from ut0ut.c to
ha_prototypes.h. Enclose the definitions in ha_prototypes.h in
#ifndef UNIV_HOTBACKUP.
storage/innobase/include/mach0data.h:
Apply snapshot innodb-5.1-ss1989

Revision r1779:
Fix a bug that handles the case where the host specific byte order matches
the InnoDB storage byte order, which is big-endian.
storage/innobase/include/mach0data.ic:
Apply snapshot innodb-5.1-ss1989

Revision r1779:
Fix a bug that handles the case where the host specific byte order matches
the InnoDB storage byte order, which is big-endian.
storage/innobase/include/mem0dbg.h:
Apply snapshot innodb-5.1-ss1989

Revision r1830:
Improve memory debugging. This is follow-up to r1819.

mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
defined. Previously, this function was only compiled with UNIV_DEBUG.

mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
Valgrind. Otherwise, Valgrind would complain on the second call of
mem_heap_empty().

UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
for failed Valgrind checks.
storage/innobase/include/mem0mem.ic:
Apply snapshot innodb-5.1-ss1989

Revision r1830:
Improve memory debugging. This is follow-up to r1819.

mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
defined. Previously, this function was only compiled with UNIV_DEBUG.

mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
Valgrind. Otherwise, Valgrind would complain on the second call of
mem_heap_empty().

UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
for failed Valgrind checks.

Revision r1937:
mem_heap_free_top(): Remove a bogus Valgrind warning.

Revision r1819:
Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.

UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
area is defined.

UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.

UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
writable before declaring it free (unwritable). This replaces UNIV_MEM_FREE()
in many places.

mem_init_buf(): Check that the memory is writable, and declare it undefined.

mem_erase_buf(): Check that the memory is writable, and declare it freed.
storage/innobase/include/rem0rec.ic:
Apply snapshot innodb-5.1-ss1989

Revision r1918:
Improve Valgrind instrumentation.

rec_offs_set_n_alloc(): Use UNIV_MEM_ASSERT_AND_ALLOC().

UNIV_MEM_ASSERT_AND_ALLOC(): New directive, similar to
UNIV_MEM_ASSERT_AND_FREE().
storage/innobase/include/row0mysql.h:
Apply snapshot innodb-5.1-ss1989

Revision r1783:
Correct the function comments of row_create_table_for_mysql() and
row_drop_table_for_mysql().
storage/innobase/include/sync0rw.h:
Apply snapshot innodb-5.1-ss1989

Revision r1757:
Enclose rw_lock_validate() in #ifdef UNIV_DEBUG. It is only called by
debug assertions.
storage/innobase/include/univ.i:
Apply snapshot innodb-5.1-ss1989

Revision r1827:
Merge r1826 from branches/zip: UNIV_MEM_ASSERT_AND_FREE():
Use UNIV_MEM_ASSERT_W() instead of UNIV_MEM_ASSERT_RW().
The memory area need not be initialized.
This mistake was made in r1815.

Revision r1918:
Improve Valgrind instrumentation.

rec_offs_set_n_alloc(): Use UNIV_MEM_ASSERT_AND_ALLOC().

UNIV_MEM_ASSERT_AND_ALLOC(): New directive, similar to
UNIV_MEM_ASSERT_AND_FREE().