]> TLD Linux GIT Repositories - packages/mysql.git/blob - mysql-build.patch
- PLD merge
[packages/mysql.git] / mysql-build.patch
1 diff -urNbB mysql-5.0.13-rc.org/sql/mysqld.cc mysql-5.0.13-rc/sql/mysqld.cc
2 --- mysql-5.0.13-rc.org/sql/mysqld.cc   2005-09-22 21:39:56.000000000 +0200
3 +++ mysql-5.0.13-rc/sql/mysqld.cc       2005-09-29 19:29:59.991454000 +0200
4 @@ -3183,7 +3183,7 @@
5    init_ssl();
6  
7  #ifdef HAVE_LIBWRAP
8 -  libwrapName= my_progname+dirname_length(my_progname);
9 +  libwrapName= (char *)my_progname+dirname_length(my_progname);
10    openlog(libwrapName, LOG_PID, LOG_AUTH);
11  #endif
12  
13 --- Percona-Server-5.6.13-rel61.0/storage/innobase/row/row0log.cc~      2013-10-07 12:25:25.000000000 +0200
14 +++ Percona-Server-5.6.13-rel61.0/storage/innobase/row/row0log.cc       2013-10-15 18:28:42.453836505 +0200
15 @@ -2364,7 +2364,7 @@
16                 and be ignored when the operation is unsupported. */
17                 fallocate(index->online_log->fd,
18                           FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
19 -                         ofs, srv_buf_size);
20 +                         ofs, srv_sort_buf_size);
21  #endif /* FALLOC_FL_PUNCH_HOLE */
22  
23                 next_mrec = index->online_log->head.block;
24 @@ -3153,7 +3153,7 @@
25                 and be ignored when the operation is unsupported. */
26                 fallocate(index->online_log->fd,
27                           FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
28 -                         ofs, srv_buf_size);
29 +                         ofs, srv_sort_buf_size);
30  #endif /* FALLOC_FL_PUNCH_HOLE */
31  
32                 next_mrec = index->online_log->head.block;
33 --- Percona-Server-5.6.13-rel61.0/sql/mysqld.cc~        2013-10-15 18:33:37.000000000 +0200
34 +++ Percona-Server-5.6.13-rel61.0/sql/mysqld.cc 2013-10-15 18:48:42.717336416 +0200
35 @@ -6389,7 +6389,7 @@
36  
37  #ifdef HAVE_LIBWRAP
38      {
39 -      if (mysql_socket_getfd(sock) == mysql_socket_getfd(ip_sock))
40 +      if (mysql_socket_getfd(sock) == mysql_socket_getfd(base_ip_sock))
41        {
42          struct request_info req;
43          signal(SIGCHLD, SIG_DFL);
44 --- Percona-Server-5.6.13-rel61.0/sql/CMakeLists.txt~   2013-10-07 12:25:25.000000000 +0200
45 +++ Percona-Server-5.6.13-rel61.0/sql/CMakeLists.txt    2013-10-15 20:37:28.259765844 +0200
46 @@ -237,20 +237,20 @@
47                     log_event.cc log_event_old.cc binlog.cc sql_binlog.cc
48                    rpl_filter.cc rpl_record.cc rpl_record_old.cc rpl_utility.cc
49                    rpl_injector.cc)
50 -ADD_LIBRARY(binlog ${BINLOG_SOURCE})
51 +ADD_LIBRARY(binlog STATIC ${BINLOG_SOURCE})
52  SET (RPL_SOURCE rpl_handler.cc rpl_tblmap.cc)
53  ADD_DEPENDENCIES(binlog GenError)
54 -ADD_LIBRARY(rpl ${RPL_SOURCE})
55 +ADD_LIBRARY(rpl STATIC ${RPL_SOURCE})
56  SET (MASTER_SOURCE rpl_master.cc)
57  ADD_DEPENDENCIES(rpl GenError)
58 -ADD_LIBRARY(master ${MASTER_SOURCE})
59 +ADD_LIBRARY(master STATIC ${MASTER_SOURCE})
60  ADD_DEPENDENCIES(master GenError)
61  SET (SLAVE_SOURCE rpl_slave.cc rpl_reporting.cc rpl_mi.cc rpl_rli.cc
62                   rpl_info_handler.cc rpl_info_file.cc rpl_info_table.cc
63                   rpl_info_values.cc rpl_info.cc rpl_info_factory.cc
64                   rpl_info_table_access.cc dynamic_ids.cc rpl_rli_pdb.cc
65                   rpl_info_dummy.cc)
66 -ADD_LIBRARY(slave ${SLAVE_SOURCE})
67 +ADD_LIBRARY(slave STATIC ${SLAVE_SOURCE})
68  ADD_DEPENDENCIES(slave GenError)
69  ADD_LIBRARY(sqlgunitlib
70    filesort_utils.cc mdl.cc sql_list.cc sql_string.cc thr_malloc.cc