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