mysql/mysql.patch@7b145ccff1e9 (annotated)
mysql/mysql.patch
Tue, 28 Aug 2012 18:28:40 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 28 Aug 2012 18:28:40 +0200
- changeset 527
- 7b145ccff1e9
- child 528
- 3b08e6396b45
- permissions
- -rw-r--r--
Import package vendor original specs for necessary manipulations.
| michael@527 | 1 | Index: configure |
| michael@527 | 2 | --- configure.orig 2010-10-11 22:40:59.000000000 +0200 |
| michael@527 | 3 | +++ configure 2010-11-03 13:05:31.000000000 +0100 |
| michael@527 | 4 | @@ -19652,7 +19652,7 @@ |
| michael@527 | 5 | |
| michael@527 | 6 | # Enable the abi_check rule only if gcc is available |
| michael@527 | 7 | |
| michael@527 | 8 | -if test "$GCC" != "yes" || expr "$CC" : ".*icc.*" |
| michael@527 | 9 | +if true |
| michael@527 | 10 | then |
| michael@527 | 11 | ABI_CHECK="" |
| michael@527 | 12 | else |
| michael@527 | 13 | Index: include/Makefile.in |
| michael@527 | 14 | --- include/Makefile.in.orig 2010-10-11 22:40:17.000000000 +0200 |
| michael@527 | 15 | +++ include/Makefile.in 2010-11-03 13:07:11.000000000 +0100 |
| michael@527 | 16 | @@ -405,7 +405,8 @@ |
| michael@527 | 17 | decimal.h errmsg.h my_global.h my_net.h \ |
| michael@527 | 18 | my_getopt.h sslopt-longopts.h my_dir.h \ |
| michael@527 | 19 | sslopt-vars.h sslopt-case.h sql_common.h keycache.h \ |
| michael@527 | 20 | - m_ctype.h my_attribute.h my_compiler.h \ |
| michael@527 | 21 | + m_ctype.h my_attribute.h my_compiler.h rijndael.h sha1.h \ |
| michael@527 | 22 | + my_aes.h \ |
| michael@527 | 23 | $(HEADERS_GEN_CONFIGURE) \ |
| michael@527 | 24 | $(HEADERS_GEN_MAKE) |
| michael@527 | 25 | |
| michael@527 | 26 | @@ -413,8 +414,7 @@ |
| michael@527 | 27 | heap.h my_bitmap.h my_uctype.h \ |
| michael@527 | 28 | myisam.h myisampack.h myisammrg.h ft_global.h\ |
| michael@527 | 29 | mysys_err.h my_base.h help_start.h help_end.h \ |
| michael@527 | 30 | - my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \ |
| michael@527 | 31 | - my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \ |
| michael@527 | 32 | + my_nosys.h my_alarm.h queues.h my_tree.h my_trie.h hash.h thr_alarm.h \ |
| michael@527 | 33 | thr_lock.h t_ctype.h violite.h my_md5.h base64.h \ |
| michael@527 | 34 | my_handler.h my_time.h my_vle.h my_user.h \ |
| michael@527 | 35 | my_libwrap.h my_stacktrace.h |
| michael@527 | 36 | Index: mysys/default.c |
| michael@527 | 37 | --- mysys/default.c.orig 2010-10-11 22:34:24.000000000 +0200 |
| michael@527 | 38 | +++ mysys/default.c 2010-11-03 13:05:31.000000000 +0100 |
| michael@527 | 39 | @@ -1123,8 +1123,7 @@ |
| michael@527 | 40 | |
| michael@527 | 41 | #else |
| michael@527 | 42 | |
| michael@527 | 43 | - errors += add_directory(alloc, "/etc/", dirs); |
| michael@527 | 44 | - errors += add_directory(alloc, "/etc/mysql/", dirs); |
| michael@527 | 45 | + errors += add_directory(alloc, "@l_prefix@/etc/mysql/", dirs); |
| michael@527 | 46 | |
| michael@527 | 47 | #if defined(DEFAULT_SYSCONFDIR) |
| michael@527 | 48 | if (DEFAULT_SYSCONFDIR[0]) |
| michael@527 | 49 | Index: scripts/mysql_config.sh |
| michael@527 | 50 | --- scripts/mysql_config.sh.orig 2010-10-11 22:34:28.000000000 +0200 |
| michael@527 | 51 | +++ scripts/mysql_config.sh 2010-11-03 13:05:31.000000000 +0100 |
| michael@527 | 52 | @@ -104,9 +104,9 @@ |
| michael@527 | 53 | |
| michael@527 | 54 | # Create options |
| michael@527 | 55 | # We intentionally add a space to the beginning and end of lib strings, simplifies replace later |
| michael@527 | 56 | -libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" |
| michael@527 | 57 | +libs=" $ldflags -L$pkglibdir -lmysqlclient -lmysys @ZLIB_DEPS@ @NON_THREADED_LIBS@" |
| michael@527 | 58 | libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " |
| michael@527 | 59 | -libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ " |
| michael@527 | 60 | +libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r -lmysys @ZLIB_DEPS@ @LIBS@ @openssl_libs@ " |
| michael@527 | 61 | embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ " |
| michael@527 | 62 | |
| michael@527 | 63 | if [ -r "$pkglibdir/libmygcc.a" ]; then |
| michael@527 | 64 | Index: scripts/mysql_system_tables_data.sql |
| michael@527 | 65 | --- scripts/mysql_system_tables_data.sql.orig 2010-10-11 22:34:29.000000000 +0200 |
| michael@527 | 66 | +++ scripts/mysql_system_tables_data.sql 2010-11-03 13:05:31.000000000 +0100 |
| michael@527 | 67 | @@ -11,8 +11,6 @@ |
| michael@527 | 68 | -- Fill "db" table with default grants for anyone to |
| michael@527 | 69 | -- access database 'test' and 'test_%' if "db" table didn't exist |
| michael@527 | 70 | CREATE TEMPORARY TABLE tmp_db LIKE db; |
| michael@527 | 71 | -INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y'); |
| michael@527 | 72 | -INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y'); |
| michael@527 | 73 | INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0; |
| michael@527 | 74 | DROP TABLE tmp_db; |
| michael@527 | 75 | |
| michael@527 | 76 | Index: sql/Makefile.in |
| michael@527 | 77 | --- sql/Makefile.in.orig 2010-10-11 22:40:27.000000000 +0200 |
| michael@527 | 78 | +++ sql/Makefile.in 2010-11-03 13:05:31.000000000 +0100 |
| michael@527 | 79 | @@ -538,7 +538,7 @@ |
| michael@527 | 80 | $(top_builddir)/strings/libmystrings.a |
| michael@527 | 81 | |
| michael@527 | 82 | mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la |
| michael@527 | 83 | -LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@ |
| michael@527 | 84 | +LDADD = $(SUPPORTING_LIBS) @NDB_SCI_LIBS@ |
| michael@527 | 85 | mysqld_LDADD = libndb.la \ |
| michael@527 | 86 | @MYSQLD_EXTRA_LDFLAGS@ \ |
| michael@527 | 87 | @pstack_libs@ \ |
