diff options
| author | unknown <monty@work.mysql.com> | 2001-09-13 09:52:35 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-09-13 09:52:35 +0200 |
| commit | f72a33f3bce1f60404a9afc72ea3835ab72342a4 (patch) | |
| tree | 1fb0fbca5b7a4edebe2c26a5ed0b272e92bc21f2 /support-files/mysql.spec.sh | |
| parent | 8d5eecd826e20c0c4ed8f6329c0b004df1520e9a (diff) | |
| parent | 4f4bbe96f080d456cb79ac627111c056c4b15f12 (diff) | |
| download | mariadb-git-f72a33f3bce1f60404a9afc72ea3835ab72342a4.tar.gz | |
Merge with 3.23.42
configure.in:
Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
Auto merged
client/Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
heap/hp_test2.c:
Auto merged
include/global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/myisam.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysql/net.c:
Auto merged
myisam/sort.c:
Auto merged
sql-bench/test-create.sh:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mini_client.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
mysql-test/t/merge.test:
Auto merged
sql/ha_innobase.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/t/bdb.test:
Auto merged
Docs/manual.texi:
merge
myisam/myisampack.c:
merge
Diffstat (limited to 'support-files/mysql.spec.sh')
| -rw-r--r-- | support-files/mysql.spec.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 1bea22fbad7..f5ce41a1c70 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -151,9 +151,9 @@ BuildMySQL() { # The --enable-assembler simply does nothing on systems that does not # support assembler speedups. sh -c "PATH=\"${MYSQL_BUILD_PATH:-/bin:/usr/bin}\" \ - CC=\"${MYSQL_BUILD_CC:-egcs}\" \ + CC=\"${MYSQL_BUILD_CC:-gcc}\" \ CFLAGS=\"${MYSQL_BUILD_CFLAGS:- -O3}\" \ - CXX=\"${MYSQL_BUILD_CXX:-egcs}\" \ + CXX=\"${MYSQL_BUILD_CXX:-gcc}\" \ CXXFLAGS=\"${MYSQL_BUILD_CXXFLAGS:- -O3 \ -felide-constructors -fno-exceptions -fno-rtti \ }\" \ @@ -204,6 +204,7 @@ BuildMySQL "--enable-shared --enable-thread-safe-client --with-berkeley-db --wit # Save shared libraries and mysqld-max mv sql/mysqld sql/mysqld-max +nm --numeric-sort sql/mysqld-max > sql/mysqld-max.sym (cd libmysql/.libs; tar cf $RBR/shared-libs.tar *.so*) (cd libmysql_r/.libs; tar rf $RBR/shared-libs.tar *.so*) @@ -219,6 +220,7 @@ BuildMySQL "--disable-shared" \ "--with-mysqld-ldflags='-all-static'" \ "--with-client-ldflags='-all-static'" \ "--without-berkeley-db --without-innodb" +nm --numeric-sort sql/mysqld > sql/mysqld.sym %install -n mysql-%{mysql_version} RBR=$RPM_BUILD_ROOT @@ -240,6 +242,10 @@ make install DESTDIR=$RBR benchdir_root=/usr/share/ # install saved mysqld-max install -m755 $MBD/sql/mysqld-max $RBR/usr/sbin/mysqld-max +# install symbol files ( for stack trace resolution) +install -m644 $MBD/sql/mysqld-max.sym $RBR/usr/lib/mysql/mysqld-max.sym +install -m644 $MBD/sql/mysqld.sym $RBR/usr/lib/mysql/mysqld.sym + # Install logrotate and autostart install -m644 $MBD/support-files/mysql-log-rotate $RBR/etc/logrotate.d/mysql install -m755 $MBD/support-files/mysql.server $RBR/etc/rc.d/init.d/mysql @@ -349,6 +355,7 @@ fi %attr(644, root, root) /usr/info/mysql.info* %attr(755, root, root) /usr/sbin/mysqld +%attr(644, root, root) /usr/lib/mysql/mysqld.sym %attr(644, root, root) /etc/logrotate.d/mysql %attr(755, root, root) /etc/rc.d/init.d/mysql @@ -403,6 +410,7 @@ fi %files Max %attr(755, root, root) /usr/sbin/mysqld-max +%attr(644, root, root) /usr/lib/mysql/mysqld-max.sym %changelog |