Commits · f7eae9d33a27c2de83c313670767247feb12e6e3 · Kirill Smelkov / mariadb

23 Oct, 2007 4 commits

Merge mysql.com:/scratch/tnurnberg/20901/50-20901 · f7eae9d3

unknown authored Oct 23, 2007

into  mysql.com:/scratch/tnurnberg/20901/51-20901


mysql-test/r/create.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged

f7eae9d3

Bug #20901: CREATE privilege is enough to insert into a table · d4e4be8a

unknown authored Oct 23, 2007

CREATE TABLE IF NOT EXISTS ... SELECT let you insert into an existing
table as long as you had the CREATE privilege.  CREATE ... SELECT
variants now always require INSERT privilege on target table.


mysql-test/r/create.result:
  after-merge fixes, errno changed 4.1->5.0
mysql-test/t/create.test:
  after-merge fixes, errno changed 4.1->5.0

d4e4be8a

Merge mysql.com:/scratch/tnurnberg/20901/41-20901 · a06c4b53

unknown authored Oct 23, 2007

into  mysql.com:/scratch/tnurnberg/20901/50-20901


mysql-test/r/grant.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/create.result:
  SCCS merged

a06c4b53

Bug #20901: CREATE privilege is enough to insert into a table · f9d068bc

unknown authored Oct 23, 2007

CREATE TABLE IF NOT EXISTS ... SELECT let you insert into an existing
table as long as you had the CREATE privilege.  CREATE ... SELECT
variants now always require INSERT privilege on target table.


mysql-test/r/create.result:
  Show that CREATE...SELECT requires INSERT privilege on target table.
mysql-test/r/grant.result:
  Sort output for a defined state.
mysql-test/t/create.test:
  Show that CREATE...SELECT requires INSERT privilege on target table.
mysql-test/t/grant.test:
  Sort output for a defined state.
sql/sql_parse.cc:
  Require INSERT privilege on target table for CREATE ... SELECT.

f9d068bc

22 Oct, 2007 2 commits

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · 91c6e5ce
unknown authored Oct 22, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


libmysql/CMakeLists.txt:
  Auto merged
```
91c6e5ce

Fixed the Windows build failures introduced by the patch for bug #31207: Test... · 89cca4b3

unknown authored Oct 22, 2007

Fixed the Windows build failures introduced by the patch for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

89cca4b3

18 Oct, 2007 3 commits

Post-merge changes for bug #31207: Test "join_nested" shows different strategy... · 89810417
unknown authored Oct 18, 2007
```
Post-merge changes for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.
```
89810417

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · ddaecb21

unknown authored Oct 18, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


include/my_sys.h:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/sql_array.h:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ft_nlq_search.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
mysys/mf_keycache.c:
  Manual merge.
mysys/mf_sort.c:
  Manual merge.
mysys/my_lib.c:
  Manual merge.
mysys/queues.c:
  Manual merge.
sql/sql_acl.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
storage/csv/ha_tina.cc:
  Manual merge.
storage/myisam/sort.c:
  Manual merge.

ddaecb21

Merge polly.(none):/home/kaa/src/maint/bug31207/my50-bug31174 · 85f9df83

unknown authored Oct 18, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


myisam/sort.c:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

85f9df83

17 Oct, 2007 6 commits

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 9014e8e9
unknown authored Oct 17, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


libmysql/libmysql.c:
  Auto merged
```
9014e8e9

Fix syntax error build problem on Windows (variable was defined · a634d1bf

unknown authored Oct 17, 2007

in middle of block)


libmysql/libmysql.c:
  Fix syntax error - don't define new variables in the middle of a block.
  
  Also, use size_t instead of uint to avoid unnecessary casting.

a634d1bf

Fix for bug #31207: Test "join_nested" shows different strategy on IA64 · ce8bf087

unknown authored Oct 17, 2007

CPUs / Intel's ICC compile

The bug is a combination of two problems:

1. IA64/ICC MySQL binaries use glibc's qsort(), not the one in mysys.

2. The order relation implemented by join_tab_cmp() is not transitive,
i.e. it is possible to choose such a, b and c that (a < b) && (b < c)
but (c < a). This implies that result of a sort using the relation
implemented by join_tab_cmp() depends on the order in which
elements are compared, i.e. the result is implementation-specific. Since
choose_plan() uses qsort() to pre-sort the
join tables using join_tab_cmp() as a compare function, the results of
the sorting may vary depending on qsort() implementation.

It is neither possible nor important to implement a better ordering
algorithm in join_tab_cmp(). Therefore the only way to fix it is to
force our own qsort() to be used by renaming it to my_qsort(), so we don't depend
on linker to decide that.

This patch also "fixes" bug #20530: qsort redefinition violates the
standard.


include/my_sys.h:
  Renamed qsort() and qsort2() to my_qsort() and my_qsort2(). Since
  previously we relied on stdlib.h to provide a declaration for qsort(), a
  separate declaration for my_qsort() is now required.
libmysql/Makefile.shared:
  Added mf_qsort.c to libmysql, since my_lib.c now uses my_qsort() instead of qsort().
myisam/ft_boolean_search.c:
  Replaced qsort2() with my_qsort2().
myisam/ft_nlq_search.c:
  Replaced qsort2() with my_qsort2().
myisam/myisampack.c:
  Replaced qsort() with my_qsort().
myisam/sort.c:
  Replaced qsort2() with my_qsort2().
mysys/mf_keycache.c:
  Replaced qsort() with my_qsort().
mysys/mf_qsort.c:
  Renamed qsort() to my_qsort() and qsort2() to my_qsort2().
mysys/mf_sort.c:
  Replaced qsort2() with my_qsort2().
mysys/my_lib.c:
  Replaced qsort() with my_qsort().
mysys/queues.c:
  Replaced qsort2() with my_qsort2().
sql/item_cmpfunc.cc:
  Replaced qsort2() with my_qsort2().
sql/item_cmpfunc.h:
  Replaced qsort2() with my_qsort2().
sql/opt_range.cc:
  Replaced qsort() with my_qsort().
sql/records.cc:
  Replaced qsort() with my_qsort().
sql/sql_acl.cc:
  Replaced qsort() with my_qsort().
sql/sql_array.h:
  Replaced qsort() with my_qsort().
sql/sql_help.cc:
  Replaced qsort() with my_qsort().
sql/sql_select.cc:
  Replaced qsort() with my_qsort().
sql/examples/ha_tina.cc:
  Replaced qsort() with my_qsort().
sql/sql_table.cc:
  Replaced qsort() with my_qsort().

ce8bf087

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · d5cf878e

unknown authored Oct 17, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


mysql-test/r/repair.result:
  Auto merged
mysql-test/t/repair.test:
  Auto merged

d5cf878e

Merge polly.(none):/home/kaa/src/maint/mysql-4.1-maint · d73ab388

unknown authored Oct 17, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


mysql-test/r/repair.result:
  Auto merged
mysql-test/t/repair.test:
  Auto merged

d73ab388

Fixed the test case for bug #31174 to not fail on 64-bit platforms. · 77f28755
unknown authored Oct 17, 2007

77f28755

16 Oct, 2007 3 commits

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · 6f471bff

unknown authored Oct 16, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


storage/myisam/sort.c:
  Auto merged
mysql-test/r/repair.result:
  SCCS merged
mysql-test/t/repair.test:
  SCCS merged

6f471bff

Merge polly.(none):/home/kaa/src/maint/mysql-4.1-maint · 9ef7b5f6

unknown authored Oct 16, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


myisam/sort.c:
  Auto merged
mysql-test/r/repair.result:
  Auto merged
mysql-test/t/repair.test:
  Auto merged

9ef7b5f6

Merge polly.(none):/home/kaa/src/maint/bug31174/my41-bug31174 · 99a7866a
unknown authored Oct 16, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-4.1-maint
```
99a7866a

15 Oct, 2007 10 commits

Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint · 70ee3aa7

unknown authored Oct 15, 2007

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint


libmysql/libmysql.c:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged

70ee3aa7

Merge pilot.mysql.com:/data/msvensson/mysql/bug11589/my50-test_latest · 13afffd0

unknown authored Oct 15, 2007

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint


libmysql/libmysql.c:
  Auto merged
mysql-test/r/type_float.result:
  Manual merge
mysql-test/t/type_float.test:
  Manual merge

13afffd0

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 8b7ee0d6
unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b31154/b31154.5.1
```
8b7ee0d6
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 4eb55062
unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b31154/b31154.5.0
```
4eb55062
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · e9668a9b
unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b31154/b31154.5.0
```
e9668a9b
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · fbb2d1ff
unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b31154/b31154.5.1
```
fbb2d1ff
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 29b06fd0
unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b30885/b30885.5.0
```
29b06fd0

Merge mysql.com:/home/ram/work/b31154/b31154.5.0 · b777dbfb

unknown authored Oct 15, 2007

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


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

b777dbfb

Merge mysql.com:/home/ram/work/mysql-5.1-maint · 782ce024
unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b30885/b30885.5.1
```
782ce024

Merge mysql.com:/home/ram/work/b30885/b30885.5.0 · 0de64380

unknown authored Oct 15, 2007

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


mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/t/heap_btree.test:
  Auto merged
storage/heap/hp_hash.c:
  the code was changed to use bitmaps instead of key length, so ul

0de64380

12 Oct, 2007 12 commits

Merge solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint · c13ef6fd

unknown authored Oct 12, 2007

into  solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint


BitKeeper/deleted/.del-changelog~8457b43736642c:
  Auto merged
BitKeeper/deleted/.del-copyright~3c3485ee25f7cde0:
  Auto merged
BitKeeper/deleted/.del-my.cnf~c8cce985cf5872e3:
  Auto merged
BitKeeper/deleted/.del-rules~2018e0de32c6d936:
  Auto merged
BitKeeper/deleted/.del-README.debian~223f0edd363d08af:
  Auto merged
BitKeeper/deleted/.del-aa~f8c7e976fa99167f:
  Auto merged
BitKeeper/deleted/.del-ab~1145a71fc2a5dbb8:
  Auto merged
BitKeeper/deleted/.del-ac~66b41066a435209:
  Auto merged
BitKeeper/deleted/.del-ad~9296238d4d7d5bb3:
  Auto merged
BitKeeper/deleted/.del-ae~c54b032746985759:
  Auto merged
BitKeeper/deleted/.del-az~45092291b7eff90a:
  Auto merged
BitKeeper/deleted/.del-control~a2146883b4ed7c94:
  Auto merged
BitKeeper/deleted/.del-gomi~bcec57fe6195deee:
  Auto merged
BitKeeper/deleted/.del-libmysqlclient10.dirs~24c90ade3a371b6f:
  Auto merged
BitKeeper/deleted/.del-libmysqlclient10.postinst~5829f4e4a7c0206b:
  Auto merged
BitKeeper/deleted/.del-libmysqlclient9.dirs~4420713260a0eb40:
  Auto merged
BitKeeper/deleted/.del-libmysqlclient9.postinst~80ad5f1e4633a219:
  Auto merged
BitKeeper/deleted/.del-move~6b750ba06050bc92:
  Auto merged
BitKeeper/deleted/.del-mysql-bench.dirs~3407d505223bf583:
  Auto merged
BitKeeper/deleted/.del-mysql-client.dirs~3f347d1649db13e1:
  Auto merged
BitKeeper/deleted/.del-mysql-dev.dirs~c6cacea9b3289f33:
  Auto merged
BitKeeper/deleted/.del-mysql-doc.dirs~a468f79189ff27ad:
  Auto merged
BitKeeper/deleted/.del-mysql-max-debug.dirs~58d766ce6caffa2b:
  Auto merged
BitKeeper/deleted/.del-mysql-max-debug.postinst~36f2faba601ed8a:
  Auto merged
BitKeeper/deleted/.del-mysql-max-debug.postrm~26bdf891820d3671:
  Auto merged
BitKeeper/deleted/.del-mysql-max-shared.dirs~38f36e6773ac0e79:
  Auto merged
BitKeeper/deleted/.del-mysql-max-shared.postinst~3406aa3bae283fe0:
  Auto merged
BitKeeper/deleted/.del-mysql-max-shared.postrm~92193bedc2b75355:
  Auto merged
BitKeeper/deleted/.del-mysql-max.dirs~be29c2b464db6050:
  Auto merged
BitKeeper/deleted/.del-mysql-max.postinst~cc8a0b3de02b23e0:
  Auto merged
BitKeeper/deleted/.del-mysql-max.postrm~66c355bd3081578b:
  Auto merged
BitKeeper/deleted/.del-mysql-server-debug.dirs~7b6329c9df635ce4:
  Auto merged
BitKeeper/deleted/.del-mysql-server-debug.postinst~12af8ffb8a145fae:
  Auto merged
BitKeeper/deleted/.del-mysql-server-debug.postrm~ae113145ebc34ac8:
  Auto merged
BitKeeper/deleted/.del-mysql-server-shared.dirs~cb56821f47811c7c:
  Auto merged
BitKeeper/deleted/.del-mysql-server-shared.postinst~c6fee24788b634a7:
  Auto merged
BitKeeper/deleted/.del-mysql-server-shared.postrm~f3d7f9c6bfb3ca9b:
  Auto merged
BitKeeper/deleted/.del-mysql-server.conffiles~566a6664d16909f0:
  Auto merged
BitKeeper/deleted/.del-mysql-server.dirs~b12380a091807c5e:
  Auto merged
BitKeeper/deleted/.del-mysql-server.postinst~d72bf57a84001364:
  Auto merged
BitKeeper/deleted/.del-mysql-server.postrm~68a988229b41c3bb:
  Auto merged
BitKeeper/deleted/.del-mysql-server.prerm~4445eacc70e74899:
  Auto merged
BitKeeper/deleted/.del-shlibs~3fe34471c220623c:
  Auto merged
BitKeeper/deleted/.del-ta~ec794c5d9d922b6c:
  Auto merged
BitKeeper/deleted/.del-tb~8844e8c985e40d4e:
  Auto merged

c13ef6fd

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 432d42e7
unknown authored Oct 12, 2007
```
into  solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
```
432d42e7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · c75f17f1
unknown authored Oct 12, 2007
```
into  solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
```
c75f17f1

Removing 7 year old 3.23 crufty debian dir that is not in use, so as not to cause confusion. · 06553067

unknown authored Oct 12, 2007


BitKeeper/deleted/.del-README.debian:
  Delete: support-files/debian/README.debian
BitKeeper/deleted/.del-changelog~8457b43736642c:
  Delete: support-files/debian/changelog
BitKeeper/deleted/.del-control:
  Delete: support-files/debian/control
BitKeeper/deleted/.del-copyright~3c3485ee25f7cde0:
  Delete: support-files/debian/copyright
BitKeeper/deleted/.del-gomi:
  Delete: support-files/debian/gomi
BitKeeper/deleted/.del-libmysqlclient10.dirs:
  Delete: support-files/debian/libmysqlclient10.dirs
BitKeeper/deleted/.del-libmysqlclient10.postinst:
  Delete: support-files/debian/libmysqlclient10.postinst
BitKeeper/deleted/.del-libmysqlclient9.dirs:
  Delete: support-files/debian/libmysqlclient9.dirs
BitKeeper/deleted/.del-libmysqlclient9.postinst:
  Delete: support-files/debian/libmysqlclient9.postinst
BitKeeper/deleted/.del-move:
  Delete: support-files/debian/move
BitKeeper/deleted/.del-my.cnf~c8cce985cf5872e3:
  Delete: support-files/debian/my.cnf
BitKeeper/deleted/.del-mysql-bench.dirs:
  Delete: support-files/debian/mysql-bench.dirs
BitKeeper/deleted/.del-aa:
  Delete: support-files/debian/patches/aa
BitKeeper/deleted/.del-mysql-client.dirs:
  Delete: support-files/debian/mysql-client.dirs
BitKeeper/deleted/.del-mysql-dev.dirs:
  Delete: support-files/debian/mysql-dev.dirs
BitKeeper/deleted/.del-mysql-doc.dirs:
  Delete: support-files/debian/mysql-doc.dirs
BitKeeper/deleted/.del-mysql-max-debug.dirs:
  Delete: support-files/debian/mysql-max-debug.dirs
BitKeeper/deleted/.del-mysql-max-debug.postinst:
  Delete: support-files/debian/mysql-max-debug.postinst
BitKeeper/deleted/.del-mysql-max-debug.postrm:
  Delete: support-files/debian/mysql-max-debug.postrm
BitKeeper/deleted/.del-mysql-max-shared.dirs:
  Delete: support-files/debian/mysql-max-shared.dirs
BitKeeper/deleted/.del-mysql-max-shared.postinst:
  Delete: support-files/debian/mysql-max-shared.postinst
BitKeeper/deleted/.del-mysql-max-shared.postrm:
  Delete: support-files/debian/mysql-max-shared.postrm
BitKeeper/deleted/.del-mysql-max.dirs:
  Delete: support-files/debian/mysql-max.dirs
BitKeeper/deleted/.del-mysql-max.postinst:
  Delete: support-files/debian/mysql-max.postinst
BitKeeper/deleted/.del-mysql-max.postrm:
  Delete: support-files/debian/mysql-max.postrm
BitKeeper/deleted/.del-mysql-server-debug.dirs:
  Delete: support-files/debian/mysql-server-debug.dirs
BitKeeper/deleted/.del-mysql-server-debug.postinst:
  Delete: support-files/debian/mysql-server-debug.postinst
BitKeeper/deleted/.del-mysql-server-debug.postrm:
  Delete: support-files/debian/mysql-server-debug.postrm
BitKeeper/deleted/.del-mysql-server-shared.dirs:
  Delete: support-files/debian/mysql-server-shared.dirs
BitKeeper/deleted/.del-mysql-server-shared.postinst:
  Delete: support-files/debian/mysql-server-shared.postinst
BitKeeper/deleted/.del-mysql-server-shared.postrm:
  Delete: support-files/debian/mysql-server-shared.postrm
BitKeeper/deleted/.del-mysql-server.conffiles:
  Delete: support-files/debian/mysql-server.conffiles
BitKeeper/deleted/.del-mysql-server.dirs:
  Delete: support-files/debian/mysql-server.dirs
BitKeeper/deleted/.del-mysql-server.postinst:
  Delete: support-files/debian/mysql-server.postinst
BitKeeper/deleted/.del-mysql-server.postrm:
  Delete: support-files/debian/mysql-server.postrm
BitKeeper/deleted/.del-mysql-server.prerm:
  Delete: support-files/debian/mysql-server.prerm
BitKeeper/deleted/.del-rules~2018e0de32c6d936:
  Delete: support-files/debian/rules
BitKeeper/deleted/.del-shlibs:
  Delete: support-files/debian/shlibs
BitKeeper/deleted/.del-ab:
  Delete: support-files/debian/patches/ab
BitKeeper/deleted/.del-ac:
  Delete: support-files/debian/patches/ac
BitKeeper/deleted/.del-ad:
  Delete: support-files/debian/patches/ad
BitKeeper/deleted/.del-ae:
  Delete: support-files/debian/patches/ae
BitKeeper/deleted/.del-az:
  Delete: support-files/debian/patches/az
BitKeeper/deleted/.del-ta:
  Delete: support-files/debian/patches/ta
BitKeeper/deleted/.del-tb:
  Delete: support-files/debian/patches/tb

06553067

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 3e7b9381
unknown authored Oct 12, 2007
```
into  sin.intern.azundris.com:/home/tnurnberg/30951/51-30951
```
3e7b9381
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · ca83ea5e
unknown authored Oct 12, 2007
```
into  sin.intern.azundris.com:/home/tnurnberg/30951/50-30951
```
ca83ea5e
Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · 767c36b4
unknown authored Oct 12, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


sql/mysqld.cc:
  Auto merged
```
767c36b4
Merge polly.(none):/home/kaa/src/maint/bug31254/my51-bug31254 · 62d4258f
unknown authored Oct 12, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
```
62d4258f
Merge polly.(none):/home/kaa/src/maint/bug31254/my50-bug31254 · 010d3126
unknown authored Oct 12, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
```
010d3126
Merge polly.(none):/home/kaa/src/maint/bug31254/my50-bug31254 · a463718e
unknown authored Oct 12, 2007
```
into  polly.(none):/home/kaa/src/maint/bug31254/my51-bug31254


include/my_global.h:
  Auto merged
```
a463718e

Fix for bug #31254: "Max_data_length" truncated / reported wrong · 65a32e83

unknown authored Oct 12, 2007

(compiler issue ?)

Problem:

Improper compile-time flags on AIX prevented use of files > 2 GB. This
resulted in Max_data_length being truncated to 2 GB by MyISAM code.

Solution:

Reverted large-file changes from the fix for bug10776. We need to define
_LARGE_FILES on AIX to have support for files > 2 GB.

 Since _LARGE_FILE_API is incompatible with _LARGE_FILES and may be
automatically defined by including standards.h, we also need a
workaround to avoid this conflict.


config/ac-macros/large_file.m4:
  Reverted large-file changes from the fix for bug10776. We need to define
  _LARGE_FILES on AIX to have support for files > 2 GB.
include/my_global.h:
  _LARGE_FILE_API is defined in standards.h that is automatically included
  by at least some C++ compilers on AIX. Since it is also incompatible
  with _LARGE_FILES which is required for POSIX IO calls to be
  largefile-safe, the only workaround is to explicitely #undef
  _LARGE_FILE_API.

65a32e83

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · d1aabe38
unknown authored Oct 12, 2007
```
into  sin.intern.azundris.com:/home/tnurnberg/30951/51-30951
```
d1aabe38