Commits · 954aec8f39c6a9a752b46be950e1ef1a8722a235 · nexedi / MariaDB

24 Apr, 2007 25 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint · 954aec8f
unknown authored Apr 24, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


BitKeeper/etc/ignore:
  auto-union
```
954aec8f

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

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

a8133ffa

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


sql/ha_ndbcluster.h:
  Auto merged
```
ad53a382

ha_ndbcluster.h, ha_ndbcluster.cc: · e4198bd9

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

e4198bd9

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

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

5d93925c

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

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

6af9e0c4

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

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

2e2ff84a

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

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

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

fe7dfe62

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

e5e1d9ef
Merge pilot.blaudden:/home/msvensson/mysql/bug14862/my50-bug14862 · 900b6aad
unknown authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


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

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

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

b7592bd0

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

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

b47139b1

after-merge fix · 513a7108
unknown authored Apr 24, 2007

513a7108

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb · 53b49645

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.

53b49645

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

08add233

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

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

d61dd703

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

3f717793

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

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

4cb64728

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

604c98f0

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

unknown authored Apr 23, 2007

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


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

e18b22e5

Bug#24732 Executables do not include Vista manifests · 75b3535f

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.

75b3535f

23 Apr, 2007 15 commits

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


sql/sql_table.cc:
  Auto merged
```
686d151a
Merge recycle.(none):/src/mysql-5.1-maint · 38cfe6e8
unknown authored Apr 23, 2007
```
into  recycle.(none):/src/mysql-5.1-maint_27691
```
38cfe6e8

Bug #27691 bk compilation with VC++ 2005 fails · 0432ad6c

unknown authored Apr 23, 2007

- Added appropiate casts.


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

0432ad6c

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 44ad1937
unknown authored Apr 23, 2007
```
into  recycle.(none):/src/bug24732/my50-bug24732
```
44ad1937
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 2eca1ce4
unknown authored Apr 23, 2007
```
into  recycle.(none):/src/bug24732/my51-bug24732
```
2eca1ce4

Bug#24732 Executables do not include Vista manifests · 5bfa4560

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.

5bfa4560

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

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

ffb701ab

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

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.

1ceb29e1

mysql_upgrade.test: · 656003c2

unknown authored Apr 23, 2007

  Fix minor merge "oopsie"


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

656003c2

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


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


sql/mysqld.cc:
  Auto merged
```
7142bd8e
Merge recycle.(none):/src/bug25621/my50-bug25621 · 637b0449
unknown authored Apr 23, 2007
```
into  recycle.(none):/src/bug25621/my51-bug25621


sql/mysqld.cc:
  Auto merged
```
637b0449

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

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

aedbcbe8

Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit · 535a21f3

unknown authored Apr 23, 2007

- On Windows, connection handlers while exiting properly did not 
decrement the server's thread count.


sql/mysqld.cc:
  Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit
  - Make sure that connection handlers decrement number of threads
  and handlers on Windows.
  - Signal condition variable before unlocking mutex.

535a21f3

new ndb tool to measure replication latency · 75a52bfb

unknown authored Apr 23, 2007

BitKeeper/etc/ignore:
Added storage/ndb/test/tools/rep_latency storage/ndb/test/ndbapi/testIndexStat storage/ndb/test/ndbapi/testInterpreter storage/ndb/ndbapi-examples/mgmapi_logevent/mgmapi_logevent storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2 storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1 storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index to the ignore list
storage/ndb/test/tools/rep_latency.cpp:
New BitKeeper file ``storage/ndb/test/tools/rep_latency.cpp''

75a52bfb