diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /cmake/package_name.cmake | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'cmake/package_name.cmake')
| -rw-r--r-- | cmake/package_name.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake index b027ac3901f..7d6e4d7348a 100644 --- a/cmake/package_name.cmake +++ b/cmake/package_name.cmake @@ -88,6 +88,13 @@ IF(NOT VERSION) SET(DEFAULT_MACHINE "universal") ELSE() SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}") + IF(NOT DEFAULT_MACHINE) + IF(CMAKE_SIZEOF_VOIPD EQUAL 4) + SET(DEFAULT_MACHINE "i386") + ELSE() + SET(DEFAULT_MACHINE "x86_64") + ENDIF() + ENDIF() ENDIF() IF(DEFAULT_MACHINE MATCHES "i386") SET(DEFAULT_MACHINE "x86") @@ -116,7 +123,7 @@ IF(NOT VERSION) SET(PRODUCT_TAG) ENDIF() - SET(package_name "mysql${PRODUCT_TAG}-${VERSION}-${SYSTEM_NAME_AND_PROCESSOR}") + SET(package_name "mariadb${PRODUCT_TAG}-${VERSION}-${SYSTEM_NAME_AND_PROCESSOR}") # Sometimes package suffix is added (something like "-icc-glibc23") IF(PACKAGE_SUFFIX) |