projects / packages / mysql.git / blame
| Commit | Line | Data |
|---|---|---|
| 4b06cf13 AM |
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 | ||
| 3d33faed AM |
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; | |
| 00fc1f0f AM |
33 | --- Percona-Server-5.6.13-rel61.0/sql/CMakeLists.txt~ 2013-10-07 12:25:25.000000000 +0200 |
| 34 | +++ Percona-Server-5.6.13-rel61.0/sql/CMakeLists.txt 2013-10-15 20:37:28.259765844 +0200 | |
| 35 | @@ -237,20 +237,20 @@ | |
| 36 | log_event.cc log_event_old.cc binlog.cc sql_binlog.cc | |
| 37 | rpl_filter.cc rpl_record.cc rpl_record_old.cc rpl_utility.cc | |
| 38 | rpl_injector.cc) | |
| 39 | -ADD_LIBRARY(binlog ${BINLOG_SOURCE}) | |
| 40 | +ADD_LIBRARY(binlog STATIC ${BINLOG_SOURCE}) | |
| 41 | SET (RPL_SOURCE rpl_handler.cc rpl_tblmap.cc) | |
| 42 | ADD_DEPENDENCIES(binlog GenError) | |
| 43 | -ADD_LIBRARY(rpl ${RPL_SOURCE}) | |
| 44 | +ADD_LIBRARY(rpl STATIC ${RPL_SOURCE}) | |
| 45 | SET (MASTER_SOURCE rpl_master.cc) | |
| 46 | ADD_DEPENDENCIES(rpl GenError) | |
| 47 | -ADD_LIBRARY(master ${MASTER_SOURCE}) | |
| 48 | +ADD_LIBRARY(master STATIC ${MASTER_SOURCE}) | |
| 49 | ADD_DEPENDENCIES(master GenError) | |
| 50 | SET (SLAVE_SOURCE rpl_slave.cc rpl_reporting.cc rpl_mi.cc rpl_rli.cc | |
| 51 | rpl_info_handler.cc rpl_info_file.cc rpl_info_table.cc | |
| 52 | rpl_info_values.cc rpl_info.cc rpl_info_factory.cc | |
| 53 | rpl_info_table_access.cc dynamic_ids.cc rpl_rli_pdb.cc | |
| 54 | rpl_info_dummy.cc) | |
| 55 | -ADD_LIBRARY(slave ${SLAVE_SOURCE}) | |
| 56 | +ADD_LIBRARY(slave STATIC ${SLAVE_SOURCE}) | |
| 57 | ADD_DEPENDENCIES(slave GenError) | |
| 58 | ADD_LIBRARY(sqlgunitlib | |
| 59 | filesort_utils.cc mdl.cc sql_list.cc sql_string.cc thr_malloc.cc |