Commits · 82ea4c95674f7e5393160d3b681f4d180bdb6ccd · Kirill Smelkov / mariadb

25 Jul, 2007 6 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 82ea4c95
unknown authored Jul 25, 2007
```
into  amd64.(none):/src/bug24732/my51-bug24732
```
82ea4c95

Bug#24732 Executables do not include Vista manifests · 2336151b

unknown authored Jul 25, 2007

- Required manual merge.


CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Search for additional tools necessary to embed, catalog and sign
  targets.
win/README:
  Bug#24732 Executables do not include Vista manifests
  - Add internal only note to EMBED_MANIFESTS option.

2336151b

Merge amd64.(none):/src/bug24732/my50-bug24732 · 5401e213

unknown authored Jul 25, 2007

into  amd64.(none):/src/bug24732/my51-bug24732


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
BitKeeper/deleted/.del-README~1:
  Auto merged

5401e213

Bug#24732 Executables do not include Vista manifests · a34879eb

unknown authored Jul 25, 2007

- Sign executables with MySQL AB security certificate.


BitKeeper/etc/ignore:
  Bug#24732 Executables do not include Vista manifests
  - Ignore security catalog descriptions
CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Search for additional tools necessary to embed, catalog and sign
  targets.
win/README:
  Bug#24732 Executables do not include Vista manifests
  - Add internal only note to EMBED_MANIFESTS option.
win/create_manifest.js:
  Bug#24732 Executables do not include Vista manifests
  - Added publicKeyToken attribute to manifest.
win/mysql_manifest.cmake:
  Bug#24732 Executables do not include Vista manifests
  - Add additional commands to create security catalog and sign 
  targets.
  - Add parameters to add appropiate hash attribute to manifest
  and create security content description of the security catalog.

a34879eb

Apply snapshot innodb-51-ss1644 · c2f0c211

unknown authored Jul 24, 2007

Fixes:
- Bug #23710: crash_commit_before fails if innodb_file_per_table=1
- Bug #28254: innodb crash if shutdown during innodb_table_monitor is running
- Bug #28604: innodb_force_recovery restricts data dump
- Bug #29097: fsp_get_available_space_in_free_extents() is capped at 4TB
- Bug #29155: Innodb "Parallel recovery" is not prevented

storage/innobase/Makefile.am:
Apply snapshot innodb-51-ss1644

Revision r1632:
Add include/lock0priv.h to noinst_HEADERS in Makefile.am.

Revision r1636:
Move lock_get_type() from lock/lock0lock.c to include/lock0priv.ic:
* lock0lock.c: remove lock_get_type() and include include/lock0priv.ic
* lock0priv.h: include lock0priv.ic and add lock_get_type() prototype
* Makefile.am: add lock0priv.ic to noinst_HEADERS
* lock0priv.ic: introduce this new file containing the body of
lock_get_type()

This move is necessary in order to use lock_get_type() from other lock/
source files (it's going to be used in lock/lock0iter.c).

Approved by: Heikki

Revision r1638:
Introduce a lock queue iterator for easy (and opaque) traversing of lock
queues. Supports table and record lock queues via the same interface.

There is only "get previous" method because currently there is no need
for "get next" - it would be unused. Feel free to add one if needed.

Approved by: Heikki
storage/innobase/buf/buf0buf.c:
Apply snapshot innodb-51-ss1644

Revision r1624:
Fix change missed as part of Bug 15815. Use a function to check if a block
needs to be made younger.

Revision r1581:
Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
storage/innobase/buf/buf0lru.c:
Apply snapshot innodb-51-ss1644

Revision r1581:
Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
storage/innobase/fsp/fsp0fsp.c:
Apply snapshot innodb-51-ss1644

Revision r1605:
Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
by typecasting the variables before multiplying them, so that the result of
the multiplication is of type "unsigned long long".

I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
use it without overwriting it with zeroes (by commenting the code that
overwrites :newraw files).

New type ullint is introduced with the sole purpose of shortening
"unsigned long long", please do not define it to something else than
"unsigned long long".

Approved by: Heikki
storage/innobase/handler/ha_innodb.cc:
Apply snapshot innodb-51-ss1644

I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
use it without overwriting it with zeroes (by commenting the code that
overwrites :newraw files).

New type ullint is introduced with the sole purpose of shortening
"unsigned long long", please do not define it to something else than
"unsigned long long".

Approved by: Heikki

Revision r1573:
create_table_def(): Eliminate the inline function call to dict_table_is_comp()
that was introduced in r1571. Inlining is disabled in ha_innodb.cc.

Revision r1574:
innodb_check_for_record_too_big_error(): Divide the return value of
page_get_free_space_of_empty_noninline() by 2. Until r1571, that function
did not return the same value as page_get_free_space_of_empty().

Revision r1571:
Fix a severe bug that was introduced in r1422 when fixing Bug 21101.
When creating an index containing a too long record, InnoDB would
dereference a NULL pointer when trying to determine the maximum row length.

innodb_check_for_record_too_big_error(): Replace the dict_table_t*
parameter with a Boolean flag. There is not always a dict_table_t object
when this function is called.

page_get_free_space_of_empty_noninline(): Move the definition and
declaration from row0mysql (!) to page0page. Make the signature
identical with page_get_free_space_of_empty().

create_clustered_index_when_no_primary(): Add the parameter "comp".
Remove unnecessary casts.
storage/innobase/include/buf0buf.ic:
Apply snapshot innodb-51-ss1644

Revision r1624:
Fix change missed as part of Bug 15815. Use a function to check if a block
needs to be made younger.
storage/innobase/include/fsp0fsp.h:
Apply snapshot innodb-51-ss1644

I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
use it without overwriting it with zeroes (by commenting the code that
overwrites :newraw files).

New type ullint is introduced with the sole purpose of shortening
"unsigned long long", please do not define it to something else than
"unsigned long long".

Approved by: Heikki
storage/innobase/include/lock0lock.h:
Apply snapshot innodb-51-ss1644

Revision r1623:
Fix typo in comment.

Revision r1628:
lock_has_to_wait() is needed in the INFORMATION_SCHEMA implementation
in order to determine which lock is blocking which. Make it non-static
and put its definition in include/lock0lock.h.

Approved by: Heikki (via IM)
storage/innobase/include/mem0mem.ic:
Apply snapshot innodb-51-ss1644

Revision r1581:
Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
storage/innobase/include/page0page.h:
Apply snapshot innodb-51-ss1644

innodb_check_for_record_too_big_error(): Replace the dict_table_t*
parameter with a Boolean flag. There is not always a dict_table_t object
when this function is called.

page_get_free_space_of_empty_noninline(): Move the definition and
declaration from row0mysql (!) to page0page. Make the signature
identical with page_get_free_space_of_empty().

create_clustered_index_when_no_primary(): Add the parameter "comp".
Remove unnecessary casts.
storage/innobase/include/row0mysql.h:
Apply snapshot innodb-51-ss1644

innodb_check_for_record_too_big_error(): Replace the dict_table_t*
parameter with a Boolean flag. There is not always a dict_table_t object
when this function is called.

page_get_free_space_of_empty_noninline(): Move the definition and
declaration from row0mysql (!) to page0page. Make the signature
identical with page_get_free_space_of_empty().

create_clustered_index_when_no_primary(): Add the parameter "comp".
Remove unnecessary casts.
storage/innobase/include/univ.i:
Apply snapshot innodb-51-ss1644

I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
use it without overwriting it with zeroes (by commenting the code that
overwrites :newraw files).

New type ullint is introduced with the sole purpose of shortening
"unsigned long long", please do not define it to something else than
"unsigned long long".

Approved by: Heikki

Revision r1581:
Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
storage/innobase/lock/lock0lock.c:
Apply snapshot innodb-51-ss1644

Revision r1631:
Move lock_rec_find_set_bit() and lock_rec_get_prev() from
lock/lock0lock.c to include/lock0priv.h and make them non-static.
They will be used in lock/lock0iter.c.

Approved by: Heikki

This move is necessary in order to use lock_get_type() from other lock/
source files (it's going to be used in lock/lock0iter.c).

Approved by: Heikki

Approved by: Heikki (via IM)

Revision r1629:
Add "const" qualifiers to lock_get_type() and lock_get_mode().

Approved by: Sunny

Revision r1626:
Move lock_*struct structures from lock/lock0lock.c to include/lock0priv.h.

This is needed in order to add more code to lock/ that uses members of
these structures (internal to the lock module) but in a separate file,
rather than lock0lock.c. lock0lock.c is a way too big already.

Approved by: Sunny
storage/innobase/log/log0recv.c:
Apply snapshot innodb-51-ss1644

Revision r1607:
Bug#23710

At InnoDB startup consider the case where log scan went beyond checkpoint_lsn as a crash and initiate crash recovery code path.

reviewed by: Heikki
storage/innobase/mem/mem0mem.c:
Apply snapshot innodb-51-ss1644

Revision r1581:
Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
storage/innobase/mem/mem0pool.c:
Apply snapshot innodb-51-ss1644

Revision r1581:
Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
storage/innobase/os/os0file.c:
Apply snapshot innodb-51-ss1644

Revision r1613:
Fix Bug#29155 by enabling file locking on FreeBSD.
It has been disabled because InnoDB has refused to start on
FreeBSD & LinuxThreads, but now it starts just fine.

Approved by: Heikki
storage/innobase/page/page0page.c:
Apply snapshot innodb-51-ss1644

innodb_check_for_record_too_big_error(): Replace the dict_table_t*
parameter with a Boolean flag. There is not always a dict_table_t object
when this function is called.

page_get_free_space_of_empty_noninline(): Move the definition and
declaration from row0mysql (!) to page0page. Make the signature
identical with page_get_free_space_of_empty().

create_clustered_index_when_no_primary(): Add the parameter "comp".
Remove unnecessary casts.
storage/innobase/rem/rem0rec.c:
Apply snapshot innodb-51-ss1644

Revision r1581:
Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
storage/innobase/row/row0mysql.c:
Apply snapshot innodb-51-ss1644

innodb_check_for_record_too_big_error(): Replace the dict_table_t*
parameter with a Boolean flag. There is not always a dict_table_t object
when this function is called.

page_get_free_space_of_empty_noninline(): Move the definition and
declaration from row0mysql (!) to page0page. Make the signature
identical with page_get_free_space_of_empty().

create_clustered_index_when_no_primary(): Add the parameter "comp".
Remove unnecessary casts.
storage/innobase/sync/sync0rw.c:
Apply snapshot innodb-51-ss1644

Revision r1598:
Add some comments.

Approved by: Heikki (via IM)
storage/innobase/sync/sync0sync.c:
Apply snapshot innodb-51-ss1644

Revision r1598:
Add some comments.

Approved by: Heikki (via IM)
storage/innobase/trx/trx0sys.c:
Apply snapshot innodb-51-ss1644

Revision r1581:
Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
storage/innobase/trx/trx0trx.c:
Apply snapshot innodb-51-ss1644

Revision r1595:
trx_commit_for_mysql(): Avoid acquiring and releasing kernel_mutex when
trx->sess or trx_dummy_sess is non-NULL.
storage/innobase/ut/ut0mem.c:
Apply snapshot innodb-51-ss1644

Revision r1581:
Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.

c2f0c211

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/jul24/50 · 9e5390c2

unknown authored Jul 24, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/jul24/51


sql/sql_table.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Use local (manual merge)

9e5390c2

24 Jul, 2007 2 commits

Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · e716c2bc

unknown authored Jul 24, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/jul24/51


mysql-test/r/innodb_mysql.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge

e716c2bc

Merge ramayana.hindu.god:/home/tsmith/m/bk/50 · 1370b325

unknown authored Jul 24, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/jul24/50


sql/sql_table.cc:
  Auto merged

1370b325

21 Jul, 2007 1 commit

Merge trift2.:/MySQL/M50/push-5.0 · ce203858

unknown authored Jul 21, 2007

into  trift2.:/MySQL/M51/push-5.1


libmysql/libmysql.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged

ce203858

20 Jul, 2007 18 commits

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 47507276

unknown authored Jul 21, 2007

into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build


libmysql/libmysql.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged

47507276

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · 066d97ba

unknown authored Jul 21, 2007

into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build


libmysql/libmysql.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged

066d97ba

Merge gleb.loc:/home/uchum/work/bk/5.0-opt · d9bad2ac

unknown authored Jul 21, 2007

into  gleb.loc:/home/uchum/work/bk/5.1-opt


mysql-test/r/cast.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

d9bad2ac

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · d758b1e6
unknown authored Jul 20, 2007
```
into  moonbone.local:/mnt/gentoo64/work/29898-bug-5.0-opt-mysql
```
d758b1e6
Merge trift-lap.none:/MySQL/M50/push-5.0 · 9c729012
unknown authored Jul 20, 2007
```
into  trift-lap.none:/MySQL/M51/push-5.1
```
9c729012
Merge trift-lap.none:/MySQL/M50/bug14151-5.0 · 366c21fe
unknown authored Jul 20, 2007
```
into  trift-lap.none:/MySQL/M50/push-5.0
```
366c21fe
Merge trift-lap.none:/MySQL/M51/bug14151-5.1 · 193d5f54
unknown authored Jul 20, 2007
```
into  trift-lap.none:/MySQL/M51/push-5.1
```
193d5f54
after-merge fixup · 3d2675ec
unknown authored Jul 20, 2007

3d2675ec

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 91e5864d

unknown authored Jul 20, 2007

into  mysql.com:/home/ram/work/b28125/b28125.5.0


mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/r/innodb_mysql.result:
  manual merge.

91e5864d

after-merge fixup · 86622591
unknown authored Jul 20, 2007

86622591

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 1bd1216f

unknown authored Jul 20, 2007

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


libmysql/libmysql.c:
  SCCS merged
sql/field.cc:
  SCCS merged
sql/field.h:
  SCCS merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
  SCCS merged
configure.in:
  SCCS merged
scripts/make_binary_distribution.sh:
  SCCS merged

1bd1216f

Merge mysql.com:/home/ram/work/mysql-5.1-maint · a0961eba
unknown authored Jul 20, 2007
```
into  mysql.com:/home/ram/work/b28125/b28125.5.1
```
a0961eba

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.46 · d8305ab9

unknown authored Jul 20, 2007

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged

d8305ab9

after-merge fixup. · 30b0de25
unknown authored Jul 20, 2007

30b0de25

Merge mysql.com:/home/ram/work/b29923/b29923.5.0 · 338c7f1b

unknown authored Jul 20, 2007

into  mysql.com:/home/ram/work/b29923/b29923.5.1


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
storage/federated/ha_federated.h:
  Auto merged

338c7f1b

Fixed #29923: federated.test fails in 5.0-maint, 5.1-maint · 28ec0efc

unknown authored Jul 20, 2007

Result adjusted.


mysql-test/r/federated.result:
  Fixed #29923: federated.test fails in 5.0-maint, 5.1-maint
    - result adjusted.

28ec0efc

Merge mysql.com:/home/ram/work/b28125/b28125.5.0 · dae4ffda

unknown authored Jul 20, 2007

into  mysql.com:/home/ram/work/b28125/b28125.5.1


sql/sql_table.cc:
  Auto merged
mysql-test/include/mix1.inc:
  manual merge

dae4ffda

Merge gleb.loc:/home/uchum/work/bk/5.0-opt · d3294a60

unknown authored Jul 20, 2007

into  gleb.loc:/home/uchum/work/bk/5.1-opt


sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

d3294a60

19 Jul, 2007 13 commits

Merge gleb.loc:/home/uchum/work/bk/5.1 · 568eccb5

unknown authored Jul 20, 2007

into  gleb.loc:/home/uchum/work/bk/5.1-opt


mysql-test/t/disabled.def:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  SCCS merged
tests/mysql_client_test.c:
  SCCS merged

568eccb5

Merge gleb.loc:/home/uchum/work/bk/5.0 · db31d3c9

unknown authored Jul 20, 2007

into  gleb.loc:/home/uchum/work/bk/5.0-opt


sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

db31d3c9

Merge gleb.loc:/home/uchum/work/bk/5.0-opt · a71eda72

unknown authored Jul 20, 2007

into  gleb.loc:/home/uchum/work/bk/5.1-opt


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged

a71eda72

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.44 · 77a0e7f7

unknown authored Jul 19, 2007

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.46


configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged

77a0e7f7

BUG#20815 Errno 12 on Windows after 197 connections · d9fda1cf

unknown authored Jul 19, 2007


CMakeLists.txt:
  BUG#20815 Set stack size. This value is really supposed to be the linker's default. I'm not quite sure why we have to specify it manually too.

d9fda1cf

Merge damien-katzs-computer.local:/Users/dkatz/mysql51 · 33f6bd0b
unknown authored Jul 19, 2007
```
into  damien-katzs-computer.local:/Users/dkatz/51
```
33f6bd0b

Bug#29898: Item_date_typecast::val_int doesn't reset the null_value flag. · a131428f

unknown authored Jul 20, 2007

The Item_date_typecast::val_int function doesn't reset null_value flag.
This makes all values that follows the first null value to be treated as nulls
and led to a wrong result.

Now the Item_date_typecast::val_int function correctly sets the null_value flag
for both null and non-null values.


mysql-test/t/cast.test:
  Added a test case for the bug#29898:  Item_date_typecast::val_int doesn't reset
  the null_value flag.
mysql-test/r/cast.result:
  Added a test case for the bug#29898:  Item_date_typecast::val_int doesn't reset
  the null_value flag.
sql/item_timefunc.cc:
  Bug#29898: Item_date_typecast::val_int doesn't reset the null_value flag.
  Now the Item_date_typecast::val_int function correctly sets the null_value flag
  for both null and non-null values.

a131428f

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my51-bug26909 · 3f102f2e

unknown authored Jul 19, 2007

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


mysql-test/t/federated.test:
  Auto merged
storage/federated/ha_federated.h:
  Auto merged
mysql-test/r/federated.result:
  manual merge

3f102f2e

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my50-bug26909 · f812c6b7

unknown authored Jul 19, 2007

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my51-bug26909


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
storage/federated/ha_federated.h:
  manual merge

f812c6b7

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 6a5fff64

unknown authored Jul 19, 2007

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


mysql-test/t/federated.test:
  Auto merged
sql/ha_federated.h:
  Auto merged
mysql-test/r/federated.result:
  Manual merge.

6a5fff64

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my50-bug26909 · 99af63e5
unknown authored Jul 19, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
99af63e5
Bug #29910 Sporadic test failure in status.test · 4740e005
unknown authored Jul 19, 2007
```
mysql-test/t/status.test:
  Fixed test to correctly wait for right server process and state.
```
4740e005
mysql_client_test fixed · 39433686
unknown authored Jul 20, 2007
```
tests/mysql_client_test.c:
  rc assignement added
```
39433686