Commits · b6a83383e36a910a40d073a4335c5c1d6f1270d6 · nexedi / MariaDB

24 Apr, 2007 27 commits

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · b6a83383
unknown authored Apr 24, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
b6a83383
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint · 95559f36
unknown authored Apr 24, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


BitKeeper/etc/ignore:
  auto-union
```
95559f36
Added missing backslash · 6e7e6077
unknown authored Apr 24, 2007

6e7e6077

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 794cc8d9

unknown authored Apr 24, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

794cc8d9

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb · 5d60d2ee
unknown authored Apr 24, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.h:
  Auto merged
```
5d60d2ee

ha_ndbcluster.h, ha_ndbcluster.cc: · be5a3426

unknown authored Apr 24, 2007

  Refactored code for engine_condition_pushdown to ha_ndbcluster_cond
Makefile.am:
  Added compilation of ha_ndbcluster_cond
ha_ndbcluster_cond.h, ha_ndbcluster_cond.cc:
  Merge


libmysqld/Makefile.am:
  Added compilation of ha_ndbcluster_cond
sql/Makefile.am:
  Added compilation of ha_ndbcluster_cond
sql/ha_ndbcluster.cc:
  Refactored code for engine_condition_pushdown to ha_ndbcluster_cond
sql/ha_ndbcluster.h:
  Refactored code for engine_condition_pushdown to ha_ndbcluster_cond
sql/ha_ndbcluster_cond.cc:
  Merge
sql/ha_ndbcluster_cond.h:
  Merge

be5a3426

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · d5ede428

unknown authored Apr 24, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


include/m_ctype.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/Makefile.am:
  Manual merge

d5ede428

Merge pilot.blaudden:/home/msvensson/mysql/bug25118/my50-bug25118 · f692f710

unknown authored Apr 24, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged

f692f710

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 5018e666

unknown authored Apr 24, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


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

5018e666

Merge bk-internal:/home/bk/mysql-5.0-maint · 90bb6c54
unknown authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
90bb6c54

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 5ceab2fe

unknown authored Apr 24, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/mysql_upgrade.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

5ceab2fe

Merge bk-internal:/home/bk/mysql-5.0-maint · 75a424ee
unknown authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
75a424ee
Moved method definition to ease merge to 5.1 · 38672eb7
unknown authored Apr 24, 2007

38672eb7
Merge pilot.blaudden:/home/msvensson/mysql/bug14862/my50-bug14862 · de71b107
unknown authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


include/my_global.h:
  Auto merged
```
de71b107
Merge bk-internal:/home/bk/mysql-5.1-new-maint · ab8039ca
unknown authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
ab8039ca

Merge pilot.blaudden:/home/msvensson/mysql/my51-m-mysql_upgrade · 67a9f239

unknown authored Apr 24, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


scripts/mysql_system_tables_fix.sql:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged

67a9f239

Merge mysql.com:/home/ram/work/mysql-5.0-maint · 842cbb01

unknown authored Apr 24, 2007

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


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

842cbb01

after-merge fix · 6ed58d79
unknown authored Apr 24, 2007

6ed58d79

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb · 5506f6ca

unknown authored Apr 24, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/Makefile.am:
  Using local, will merge manually
sql/ha_ndbcluster.cc:
  Using local, will merge manually.
sql/ha_ndbcluster.h:
  Using local, will merge manually.

5506f6ca

Back-ported compiler warning fixes from 5.1 to ease merging · 25b372b3
unknown authored Apr 24, 2007

25b372b3

Merge mysql.com:/home/ram/work/b27515/b27515.5.0 · 3af43cec

unknown authored Apr 24, 2007

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


mysql-test/t/grant.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/grant.result:
  will be merged in a post-merge CS

3af43cec

after-merge fix · 3aea34b4
unknown authored Apr 24, 2007

3aea34b4

Merge mysql.com:/home/ram/work/b27515/b27515.4.1 · b8850e15

unknown authored Apr 24, 2007

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


mysql-test/r/grant.result:
  will be merged in a post-merge CS
mysql-test/t/grant.test:
  manual merge
sql/sql_parse.cc:
  manual merge

b8850e15

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 6b2685b6
unknown authored Apr 23, 2007
```
into  recycle.(none):/src/bug24732/my50-bug24732
```
6b2685b6
Post Merge Correction · e208964b
unknown authored Apr 23, 2007

e208964b

Merge recycle.(none):/src/bug24732/my50-bug24732 · 7f2b829c

unknown authored Apr 23, 2007

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


BitKeeper/deleted/.del-Makefile.am~2:
  Auto merged

7f2b829c

Bug#24732 Executables do not include Vista manifests · 6f6f6806

unknown authored Apr 23, 2007

- Correct PushBuild failure.


win/Makefile.am:
  Bug#24732 Executables do not include Vista manifests
  - Make sure new files are included in make dist builds.

6f6f6806

23 Apr, 2007 13 commits

Merge recycle.(none):/src/mysql-5.1-maint · 0ec5bd1c
unknown authored Apr 23, 2007
```
into  recycle.(none):/src/mysql-5.1-maint_25141


sql/sql_table.cc:
  Auto merged
```
0ec5bd1c
Merge recycle.(none):/src/mysql-5.1-maint · 809a28d4
unknown authored Apr 23, 2007
```
into  recycle.(none):/src/mysql-5.1-maint_27691
```
809a28d4

Bug #27691 bk compilation with VC++ 2005 fails · 142dbcd7

unknown authored Apr 23, 2007

- Added appropiate casts.


sql/log_event.cc:
  Bug #27691 bk compilation with VC++ 2005 fails
  - Add appropiate casts.

142dbcd7

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 7f439708
unknown authored Apr 23, 2007
```
into  recycle.(none):/src/bug24732/my50-bug24732
```
7f439708
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 06d3bda2
unknown authored Apr 23, 2007
```
into  recycle.(none):/src/bug24732/my51-bug24732
```
06d3bda2

Bug#24732 Executables do not include Vista manifests · 7ad5d7c1

unknown authored Apr 23, 2007

- Post merge cleanup.


CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Added logic for EMBED_MANIFESTS configuration option.
client/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for client executables.
extra/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for my_print_default executable.
libmysql/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for myTest executable.
server-tools/instance-manager/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for mysqlmanager executable.
sql/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for mysqld executable.
storage/myisam/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for myisam executables.
win/README:
  Bug#24732 Executables do not include Vista manifests
  - Added new configuration option documentation.
win/configure.js:
  Bug#24732 Executables do not include Vista manifests
  - Added new EMBED_MANIFESTS configuration option.

7ad5d7c1

Merge recycle.(none):/src/bug24732/my50-bug24732 · 917f89ce

unknown authored Apr 23, 2007

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


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~10:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~13:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~c20dcd005f596740:
  Auto merged
BitKeeper/deleted/.del-README~1:
  Auto merged
BitKeeper/deleted/.del-configure.js:
  Auto merged

917f89ce

Bug#24732 Executables do not include Vista manifests · 1ce0d7c6

unknown authored Apr 23, 2007

- Added script to generate application specific manifest.
- Added new CMake MACRO to add customer build events which will first
generate a manifest and then embeds that manifest into an executable.


BitKeeper/etc/ignore:
  Bug#24732 Executables do not include Vista manifests
  - Revise ignore rules to disallow auto-generated cmake files but to allow
  custom macros defined in a .cmake file.
CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Added logic for EMBED_MANIFESTS configuration option.
client/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for client executables.
extra/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for my_print_default executable.
libmysql/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for myTest executable.
myisam/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for myisam executables.
server-tools/instance-manager/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for mysqlmanager executable.
sql/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for mysqld executable.
win/README:
  Bug#24732 Executables do not include Vista manifests
  - Added new configuration option documentation.
win/configure.js:
  Bug#24732 Executables do not include Vista manifests
  - Added new EMBED_MANIFESTS configuration option.
win/create_manifest.js:
  Bug#24732 Executables do not include Vista manifests
  - Manifest generator.  This script generates a basic manifest.
win/mysql_manifest.cmake:
  Bug#24732 Executables do not include Vista manifests
  - Define new CMake MACRO for adding Windows manifests to executables.

1ce0d7c6

mysql_upgrade.test: · 68d4ee62

unknown authored Apr 23, 2007

  Fix minor merge "oopsie"


mysql-test/t/mysql_upgrade.test:
  Fix minor merge "oopsie"

68d4ee62

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · dc5dd7a2
unknown authored Apr 23, 2007
```
into  recycle.(none):/src/bug25621/my50-bug25621


sql/mysqld.cc:
  Auto merged
```
dc5dd7a2
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · d3fac6d2
unknown authored Apr 23, 2007
```
into  recycle.(none):/src/bug25621/my51-bug25621


sql/mysqld.cc:
  Auto merged
```
d3fac6d2
Merge recycle.(none):/src/bug25621/my50-bug25621 · 0b07ccbe
unknown authored Apr 23, 2007
```
into  recycle.(none):/src/bug25621/my51-bug25621


sql/mysqld.cc:
  Auto merged
```
0b07ccbe

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · e79f14e1

unknown authored Apr 23, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


BitKeeper/etc/ignore:
  auto-union
storage/ndb/test/tools/Makefile.am:
  manual merge
storage/ndb/test/tools/listen.cpp:
  manual merge

e79f14e1