Skip to content
Permalink
Browse files

Merge 10.3 into 10.4

  • Loading branch information...
dr-m committed Jul 25, 2019
2 parents 17794fb + f3eb82f commit e9c1701e11e2441435223cc7c00c467f58aaff19
Showing with 7,976 additions and 5,466 deletions.
  1. +3 −0 CMakeLists.txt
  2. +1 −0 client/mysqlbinlog.cc
  3. +1 −10 cmake/cpack_rpm.cmake
  4. +6 −0 cmake/misc.cmake
  5. +14 −11 cmake/mysql_version.cmake
  6. +2 −6 cmake/systemd.cmake
  7. +1 −1 debian/control
  8. +1 −1 libmariadb
  9. +8 −1 mysql-test/include/binlog_parallel_replication_marks.test
  10. +14 −0 mysql-test/include/force_restart.inc
  11. +4 −0 mysql-test/include/have_xtrabackup.inc
  12. +69 −0 mysql-test/include/wait_condition_with_debug.inc
  13. +7 −0 mysql-test/lib/My/Config.pm
  14. +19 −0 mysql-test/main/grant.result
  15. +29 −0 mysql-test/main/grant.test
  16. +1 −1 mysql-test/main/mysqld--help.result
  17. +1 −1 mysql-test/main/mysqld--help.test
  18. +2 −2 mysql-test/main/repair_symlink-5543.result
  19. +4 −4 mysql-test/main/repair_symlink-5543.test
  20. +14 −0 mysql-test/main/sp.result
  21. +20 −0 mysql-test/main/sp.test
  22. +10 −0 mysql-test/main/type_datetime.result
  23. +10 −0 mysql-test/main/type_datetime.test
  24. +39 −4 mysql-test/mysql-test-run.pl
  25. +26 −0 mysql-test/std_data/galera-cert.pem
  26. +28 −0 mysql-test/std_data/galera-key.pem
  27. +40 −0 mysql-test/std_data/galera-upgrade-ca-cert.pem
  28. +20 −0 mysql-test/std_data/galera-upgrade-server-cert.pem
  29. +28 −0 mysql-test/std_data/galera-upgrade-server-key.pem
  30. +14 −10 mysql-test/suite/binlog/include/drop_temp_table.test
  31. +16 −0 mysql-test/suite/binlog/r/binlog_mysqlbinlog_stop_never.result
  32. +0 −2 mysql-test/suite/binlog/r/binlog_parallel_replication_marks_row.result
  33. +0 −8 mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result
  34. +0 −2 mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
  35. +0 −4 mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result
  36. +66 −0 mysql-test/suite/binlog/t/binlog_mysqlbinlog_stop_never.test
  37. +7 −14 mysql-test/suite/galera/disabled.def
  38. +8 −0 mysql-test/suite/galera/r/GAL-419.result
  39. +3 −3 mysql-test/suite/galera/r/MW-329.result
  40. +31 −19 mysql-test/suite/galera/r/MW-336.result
  41. +5 −5 mysql-test/suite/galera/r/MW-416.result
  42. +11 −0 mysql-test/suite/galera/r/galera_as_slave_gtid.result
  43. +7 −1 mysql-test/suite/galera/r/galera_as_slave_gtid_replicate_do_db_cc.result
  44. +15 −0 mysql-test/suite/galera/r/galera_kill_applier.result
  45. +7 −5 mysql-test/suite/galera/r/galera_kill_ddl.result
  46. +57 −45 mysql-test/suite/galera/r/galera_log_bin.result
  47. +2 −0 mysql-test/suite/galera/r/galera_log_output_csv.result
  48. +15 −4 mysql-test/suite/galera/r/galera_sst_mysqldump_with_key,debug.rdiff
  49. +0 −11 mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result
  50. +0 −2 mysql-test/suite/galera/r/galera_sync_wait_show.result
  51. +16 −15 mysql-test/suite/galera/r/galera_toi_ddl_fk_insert.result
  52. +9 −0 mysql-test/suite/galera/r/galera_var_gtid_domain_id.result
  53. +0 −1 mysql-test/suite/galera/r/galera_var_notify_cmd.result
  54. +20 −43 mysql-test/suite/galera/r/galera_var_slave_threads.result
  55. +9 −0 mysql-test/suite/galera/r/mdev_10518.result
  56. +5 −2 mysql-test/suite/galera/t/GAL-419.test
  57. +5 −0 mysql-test/suite/galera/t/MW-329.test
  58. +7 −0 mysql-test/suite/galera/t/MW-336.cnf
  59. +44 −77 mysql-test/suite/galera/t/MW-336.test
  60. +2 −6 mysql-test/suite/galera/t/MW-416.test
  61. +14 −0 mysql-test/suite/galera/t/galera_as_slave_gtid.test
  62. +0 −2 mysql-test/suite/galera/t/galera_as_slave_gtid_replicate_do_db_cc.test
  63. +0 −1 mysql-test/suite/galera/t/galera_as_slave_nonprim.test
  64. +2 −0 mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test
  65. +23 −2 mysql-test/suite/galera/t/galera_kill_applier.test
  66. +10 −3 mysql-test/suite/galera/t/galera_kill_ddl.test
  67. +18 −8 mysql-test/suite/galera/t/galera_log_bin.test
  68. +2 −0 mysql-test/suite/galera/t/galera_log_output_csv.test
  69. +3 −1 mysql-test/suite/galera/t/galera_parallel_autoinc_largetrx.test
  70. +3 −1 mysql-test/suite/galera/t/galera_parallel_autoinc_manytrx.test
  71. +2 −0 mysql-test/suite/galera/t/galera_sync_wait_show.test
  72. +8 −9 mysql-test/suite/galera/t/galera_toi_ddl_fk_insert.test
  73. +11 −0 mysql-test/suite/galera/t/galera_var_gtid_domain_id.test
  74. +0 −2 mysql-test/suite/galera/t/galera_var_notify_cmd.test
  75. +37 −110 mysql-test/suite/galera/t/galera_var_slave_threads.test
  76. +11 −0 mysql-test/suite/galera/t/mdev_10518.test
  77. +20 −0 mysql-test/suite/galera_3nodes/r/galera_innobackupex_backup.result
  78. +1 −0 mysql-test/suite/galera_3nodes/r/galera_ipv6_mariabackup_section.result
  79. +80 −0 mysql-test/suite/galera_3nodes/t/galera_innobackupex_backup.test
  80. +2 −0 mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test
  81. +49 −0 mysql-test/suite/innodb/r/alter_large_dml.result
  82. +25 −0 mysql-test/suite/innodb/r/check_ibd_filesize,32k.rdiff
  83. +25 −0 mysql-test/suite/innodb/r/check_ibd_filesize,4k.rdiff
  84. +25 −0 mysql-test/suite/innodb/r/check_ibd_filesize,64k.rdiff
  85. +25 −0 mysql-test/suite/innodb/r/check_ibd_filesize,8k.rdiff
  86. +20 −0 mysql-test/suite/innodb/r/check_ibd_filesize.result
  87. +10 −0 mysql-test/suite/innodb/r/create_select.result
  88. +0 −465 mysql-test/suite/innodb/r/innodb-16k.result
  89. +5 −0 mysql-test/suite/innodb/r/innodb-32k-crash.result
  90. +0 −120 mysql-test/suite/innodb/r/innodb-32k.result
  91. +5 −0 mysql-test/suite/innodb/r/innodb-64k-crash.result
  92. +178 −0 mysql-test/suite/innodb/r/innodb-system-table-view.result
  93. +18 −0 mysql-test/suite/innodb/r/innodb-virtual-columns-debug.result
  94. +27 −0 mysql-test/suite/innodb/r/innodb-wl5980-debug.result
  95. +7 −47 mysql-test/suite/innodb/r/innodb_max_recordsize_32k.result
  96. +6 −67 mysql-test/suite/innodb/r/innodb_max_recordsize_64k.result
  97. +160 −24 mysql-test/suite/innodb/r/instant_alter,4k.rdiff
  98. +13 −0 mysql-test/suite/innodb/r/instant_alter.result
  99. +26 −0 mysql-test/suite/innodb/r/instant_alter_bugs.result
  100. +80 −0 mysql-test/suite/innodb/r/max_record_size,16k,compact,innodb.rdiff
  101. +224 −0 mysql-test/suite/innodb/r/max_record_size,16k,dynamic,innodb.rdiff
  102. +80 −0 mysql-test/suite/innodb/r/max_record_size,16k,innodb,redundant.rdiff
  103. +121 −0 mysql-test/suite/innodb/r/max_record_size,32k,compact,innodb.rdiff
  104. +366 −0 mysql-test/suite/innodb/r/max_record_size,32k,dynamic,innodb.rdiff
  105. +121 −0 mysql-test/suite/innodb/r/max_record_size,32k,innodb,redundant.rdiff
  106. +62 −0 mysql-test/suite/innodb/r/max_record_size,4k,compact,innodb.rdiff
  107. +128 −0 mysql-test/suite/innodb/r/max_record_size,4k,dynamic,innodb.rdiff
  108. +62 −0 mysql-test/suite/innodb/r/max_record_size,4k,innodb,redundant.rdiff
  109. +203 −0 mysql-test/suite/innodb/r/max_record_size,64k,compact,innodb.rdiff
  110. +501 −0 mysql-test/suite/innodb/r/max_record_size,64k,dynamic,innodb.rdiff
  111. +121 −0 mysql-test/suite/innodb/r/max_record_size,64k,innodb,redundant.rdiff
  112. +35 −0 mysql-test/suite/innodb/r/max_record_size,8k,compact,innodb.rdiff
  113. +134 −0 mysql-test/suite/innodb/r/max_record_size,8k,dynamic,innodb.rdiff
  114. +47 −0 mysql-test/suite/innodb/r/max_record_size.result
  115. +156 −1 mysql-test/suite/innodb/r/strict_mode.result
  116. +13 −0 mysql-test/suite/innodb/r/trx_id_future.result
  117. +5 −0 mysql-test/suite/innodb/r/undo_log.result
  118. +2 −0 mysql-test/suite/innodb/t/alter_large_dml.opt
  119. +53 −0 mysql-test/suite/innodb/t/alter_large_dml.test
  120. +53 −0 mysql-test/suite/innodb/t/check_ibd_filesize.test
  121. +28 −0 mysql-test/suite/innodb/t/create_select.test
  122. +0 −478 mysql-test/suite/innodb/t/innodb-16k.test
  123. +4 −0 mysql-test/suite/innodb/t/innodb-32k-crash.test
  124. +0 −135 mysql-test/suite/innodb/t/innodb-32k.test
  125. +4 −0 mysql-test/suite/innodb/t/innodb-64k-crash.test
  126. +10 −0 mysql-test/suite/innodb/t/innodb-system-table-view.opt
  127. +136 −0 mysql-test/suite/innodb/t/innodb-system-table-view.test
  128. +27 −0 mysql-test/suite/innodb/t/innodb-virtual-columns-debug.test
  129. +51 −0 mysql-test/suite/innodb/t/innodb-wl5980-debug.test
  130. +0 −47 mysql-test/suite/innodb/t/innodb_max_recordsize_32k.test
  131. +0 −70 mysql-test/suite/innodb/t/innodb_max_recordsize_64k.test
  132. +4 −0 mysql-test/suite/innodb/t/instant_alter.test
  133. +18 −0 mysql-test/suite/innodb/t/instant_alter_bugs.test
  134. +1,422 −0 mysql-test/suite/innodb/t/max_record_size.test
  135. +156 −1 mysql-test/suite/innodb/t/strict_mode.test
  136. +59 −0 mysql-test/suite/innodb/t/trx_id_future.test
  137. +5 −0 mysql-test/suite/innodb/t/undo_log.test
  138. +5 −0 mysql-test/suite/innodb_fts/r/innodb_fts_misc.result
  139. +8 −0 mysql-test/suite/innodb_fts/t/innodb_fts_misc.test
  140. +1 −0 mysql-test/suite/multi_source/disabled.def
  141. +25 −0 mysql-test/suite/multi_source/mdev-8874.cnf
  142. +126 −0 mysql-test/suite/multi_source/mdev-8874.result
  143. +141 −0 mysql-test/suite/multi_source/mdev-8874.test
  144. +6 −0 mysql-test/suite/parts/r/fulltext.result
  145. +9 −0 mysql-test/suite/parts/t/fulltext.test
  146. +1 −0 mysql-test/suite/plugins/disabled.def
  147. +4 −0 mysql-test/suite/rpl/include/rpl_drop_create_temp_table.test
  148. +14 −0 mysql-test/suite/rpl/r/create_or_replace_mix.result
  149. +10 −0 mysql-test/suite/rpl/r/create_or_replace_row.result
  150. +14 −0 mysql-test/suite/rpl/r/create_or_replace_statement.result
  151. +8 −3 mysql-test/suite/rpl/r/kill_race_condition.result
  152. +36 −0 mysql-test/suite/rpl/r/mdev_17588.result
  153. +7 −24 mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result
  154. +0 −27 mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result
  155. +38 −0 mysql-test/suite/rpl/r/rpl_row_drop_temp_table.result
  156. +7 −24 mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result
  157. +13 −0 mysql-test/suite/rpl/t/create_or_replace.inc
  158. +12 −5 mysql-test/suite/rpl/t/kill_race_condition.test
  159. +1 −0 mysql-test/suite/rpl/t/mdev_17588-slave.opt
  160. +39 −0 mysql-test/suite/rpl/t/mdev_17588.test
  161. +54 −0 mysql-test/suite/rpl/t/rpl_row_drop_temp_table.test
  162. +0 −1,236 mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff-disabled
  163. +0 −697 mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff-disabled
  164. +24 −5 mysql-test/suite/wsrep/r/variables.result
  165. +13 −5 mysql-test/suite/wsrep/t/variables.test
  166. +28 −11 plugin/server_audit/server_audit.c
  167. +2 −2 scripts/mysqld_safe.sh
  168. +3 −3 sql/item_func.cc
  169. +7 −4 sql/item_sum.cc
  170. +1 −1 sql/log_event.cc
  171. +5 −0 sql/mysqld.cc
  172. +0 −9 sql/rpl_mi.cc
  173. +1 −1 sql/sp_head.cc
  174. +5 −4 sql/sql_plugin.cc
  175. +4 −1 sql/sql_select.cc
  176. +1 −1 sql/sql_sequence.cc
  177. +2 −1 sql/sql_table.cc
  178. +3 −3 sql/table.cc
  179. +47 −39 sql/temporary_tables.cc
  180. +36 −1 sql/wsrep_mysqld.cc
  181. +15 −3 sql/wsrep_mysqld.h
  182. +6 −3 sql/wsrep_thd.cc
  183. +12 −6 sql/wsrep_var.cc
  184. +0 −9 storage/connect/CMakeLists.txt
  185. +2 −2 storage/connect/array.cpp
  186. +11 −11 storage/connect/csort.cpp
  187. +3 −3 storage/connect/ha_connect.cc
  188. +1 −1 storage/connect/odbconn.cpp
  189. +2 −2 storage/connect/valblk.cpp
  190. +9 −9 storage/connect/xindex.cpp
  191. +1 −2 storage/innobase/CMakeLists.txt
  192. +7 −8 storage/innobase/btr/btr0defragment.cc
  193. +2 −2 storage/innobase/buf/buf0buddy.cc
  194. +29 −23 storage/innobase/buf/buf0buf.cc
  195. +2 −2 storage/innobase/buf/buf0flu.cc
  196. +1 −1 storage/innobase/data/data0data.cc
  197. +2 −3 storage/innobase/dict/dict0defrag_bg.cc
  198. +34 −39 storage/innobase/dict/dict0dict.cc
  199. +4 −5 storage/innobase/dict/dict0stats.cc
  200. +2 −2 storage/innobase/dict/dict0stats_bg.cc
  201. +2 −1 storage/innobase/eval/eval0eval.cc
  202. +9 −10 storage/innobase/fil/fil0crypt.cc
  203. +9 −3 storage/innobase/fil/fil0fil.cc
  204. +13 −31 storage/innobase/fts/fts0fts.cc
  205. +58 −61 storage/innobase/fts/fts0opt.cc
  206. +44 −40 storage/innobase/handler/ha_innodb.cc
  207. +7 −0 storage/innobase/handler/ha_innodb.h
  208. +125 −96 storage/innobase/handler/handler0alter.cc
  209. +12 −0 storage/innobase/include/dict0dict.h
  210. +3 −0 storage/innobase/include/dict0dict.ic
  211. +10 −1 storage/innobase/include/dict0mem.h
  212. +1 −1 storage/innobase/include/dict0stats.h
  213. +2 −9 storage/innobase/include/fts0fts.h
  214. +3 −2 storage/innobase/include/fts0types.h
  215. +0 −8 storage/innobase/include/ha_prototypes.h
  216. +4 −5 storage/innobase/include/lock0lock.h
  217. +9 −5 storage/innobase/include/lock0types.h
  218. +2 −2 storage/innobase/include/log0recv.h
  219. +1 −1 storage/innobase/include/mem0mem.h
  220. +7 −2 storage/innobase/include/mem0mem.ic
  221. +22 −19 storage/innobase/include/row0ftsort.h
  222. +6 −6 storage/innobase/include/srv0mon.h
  223. +8 −4 storage/innobase/include/srv0srv.h
  224. +3 −3 storage/innobase/include/trx0i_s.h
  225. +5 −4 storage/innobase/include/trx0trx.h
  226. +0 −67 storage/innobase/include/ut0timer.h
  227. +0 −56 storage/innobase/include/ut0timer.ic
  228. +0 −67 storage/innobase/include/ut0ut.h
  229. +1 −1 storage/innobase/include/ut0wqueue.h
  230. +76 −81 storage/innobase/lock/lock0lock.cc
  231. +16 −37 storage/innobase/lock/lock0wait.cc
  232. +5 −5 storage/innobase/log/log0recv.cc
  233. +5 −18 storage/innobase/os/os0event.cc
  234. +5 −5 storage/innobase/os/os0file.cc
  235. +4 −6 storage/innobase/page/page0cur.cc
  236. +5 −5 storage/innobase/page/page0zip.cc
  237. +23 −20 storage/innobase/row/row0ftsort.cc
  238. +6 −1 storage/innobase/row/row0ins.cc
  239. +4 −2 storage/innobase/row/row0merge.cc
  240. +3 −1 storage/innobase/row/row0mysql.cc
  241. +6 −6 storage/innobase/row/row0vers.cc
  242. +18 −23 storage/innobase/srv/srv0srv.cc
  243. +0 −1 storage/innobase/srv/srv0start.cc
  244. +6 −4 storage/innobase/sync/sync0arr.cc
  245. +11 −27 storage/innobase/trx/trx0i_s.cc
  246. +2 −1 storage/innobase/trx/trx0purge.cc
  247. +2 −2 storage/innobase/trx/trx0roll.cc
  248. +13 −13 storage/innobase/trx/trx0trx.cc
  249. +0 −17 storage/innobase/ut/ut0crc32.cc
  250. +0 −90 storage/innobase/ut/ut0timer.cc
  251. +1 −148 storage/innobase/ut/ut0ut.cc
  252. +1 −1 storage/innobase/ut/ut0wqueue.cc
  253. +4 −1 storage/maria/ha_maria.cc
  254. +1 −1 storage/maria/ma_blockrec.c
  255. +1 −1 storage/maria/ma_checkpoint.c
  256. +12 −5 storage/maria/ma_loghandler.c
  257. +1 −1 storage/maria/ma_open.c
  258. +27 −11 storage/maria/ma_recovery.c
  259. +3 −9 storage/maria/ma_recovery_util.c
  260. +94 −94 storage/mroonga/ha_mroonga.hpp
  261. +2 −3 storage/mroonga/vendor/groonga/CMakeLists.txt
  262. +0 −34 storage/mroonga/vendor/groonga/lib/hash.c
  263. +0 −17 storage/mroonga/vendor/groonga/lib/ii.c
  264. +0 −14 storage/mroonga/vendor/groonga/lib/pat.c
  265. +0 −49 storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c
  266. +2 −3 storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt
  267. +17 −12 storage/rocksdb/build_rocksdb.cmake
  268. +27 −1 storage/rocksdb/ha_rocksdb.cc
  269. +3 −0 storage/rocksdb/mysql-test/rocksdb/include/have_write_prepared.inc
  270. +1 −0 storage/rocksdb/mysql-test/rocksdb/include/use_direct_io_option.inc
  271. +12 −0 storage/rocksdb/mysql-test/rocksdb/r/2pc_group_commit.result
  272. +3 −2 storage/rocksdb/mysql-test/rocksdb/r/autoinc_vars_thread.result
  273. +1 −1 storage/rocksdb/mysql-test/rocksdb/r/rocksdb_cf_per_partition.result
  274. +5 −5 storage/rocksdb/mysql-test/rocksdb/r/unique_check.result
  275. +29 −0 storage/rocksdb/mysql-test/rocksdb/t/2pc_group_commit.test
  276. +8 −2 storage/rocksdb/mysql-test/rocksdb/t/autoinc_vars_thread.test
  277. +35 −7 storage/rocksdb/mysql-test/rocksdb/t/check_ignore_unknown_options.test
  278. +4 −0 storage/rocksdb/mysql-test/rocksdb/t/disabled.def
  279. +1 −0 storage/rocksdb/mysql-test/rocksdb/t/rocksdb_cf_per_partition.test
  280. +12 −0 storage/rocksdb/mysql-test/rocksdb/t/tbl_opt_data_index_dir.test
  281. +6 −5 storage/rocksdb/mysql-test/rocksdb/t/unique_check.test
  282. +0 −5 storage/rocksdb/mysql-test/rocksdb_rpl/combinations
  283. +2 −0 storage/rocksdb/mysql-test/rocksdb_rpl/t/disabled.def
  284. +1 −1 storage/rocksdb/rocksdb
  285. +1 −1 storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake
  286. +9 −0 support-files/CMakeLists.txt
  287. +1 −1 support-files/rpm/server-postin.sh
  288. +2 −3 zlib/CMakeLists.txt
@@ -22,6 +22,9 @@ ENDIF()
IF(POLICY CMP0054)
CMAKE_POLICY(SET CMP0054 NEW)
ENDIF()
IF(POLICY CMP0075)
CMAKE_POLICY(SET CMP0075 NEW)
ENDIF()

MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")

@@ -1546,6 +1546,7 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
{
my_fwrite(result_file, (const uchar *) tmp_str.str, tmp_str.length,
MYF(MY_NABP));
fflush(result_file);
my_free(tmp_str.str);
}
}
@@ -45,17 +45,8 @@ SET(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
SET(CPACK_RPM_PACKAGE_RELOCATABLE FALSE)
SET(CPACK_PACKAGE_RELOCATABLE FALSE)
SET(CPACK_RPM_PACKAGE_GROUP "Applications/Databases")
SET(CPACK_RPM_PACKAGE_SUMMARY ${CPACK_PACKAGE_SUMMARY})
SET(CPACK_RPM_PACKAGE_URL ${CPACK_PACKAGE_URL})
SET(CPACK_RPM_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_SUMMARY}
It is GPL v2 licensed, which means you can use the it free of charge under the
conditions of the GNU General Public License Version 2 (http://www.gnu.org/licenses/).
MariaDB documentation can be found at https://mariadb.com/kb
MariaDB bug reports should be submitted through https://jira.mariadb.org
")
SET(CPACK_RPM_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION}")

SET(CPACK_RPM_shared_PACKAGE_VENDOR "MariaDB Corporation Ab")
SET(CPACK_RPM_shared_PACKAGE_LICENSE "LGPLv2.1")
@@ -11,3 +11,9 @@ ELSE()
SET(__msg1_${id} ${hash} CACHE INTERNAL "")
ENDFUNCTION()
ENDIF()

MACRO(SET_IF_UNSET VAR VAL)
IF(NOT DEFINED ${VAR})
SET(${VAR} ${VAL})
ENDIF()
ENDMACRO()
@@ -75,24 +75,27 @@ string(TOUPPER ${SERVER_MATURITY} SERVER_MATURITY)
SET(SERVER_MATURITY_LEVEL MariaDB_PLUGIN_MATURITY_${SERVER_MATURITY})

SET(MYSQL_TCP_PORT_DEFAULT 0)
IF(NOT MYSQL_TCP_PORT)
SET(MYSQL_TCP_PORT 3306)
ENDIF()
SET_IF_UNSET(MYSQL_TCP_PORT 3306)

IF(NOT COMPILATION_COMMENT)
SET(COMPILATION_COMMENT "Source distribution")
ENDIF()
SET_IF_UNSET(COMPILATION_COMMENT "Source distribution")

INCLUDE(package_name)
IF(NOT CPACK_PACKAGE_FILE_NAME)
GET_PACKAGE_FILE_NAME(CPACK_PACKAGE_FILE_NAME)
ENDIF()

IF(NOT CPACK_SOURCE_PACKAGE_FILE_NAME)
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mariadb-${VERSION}")
ENDIF()
SET(CPACK_PACKAGE_CONTACT "MariaDB Developers <maria-developers@lists.launchpad.net>")
SET(CPACK_PACKAGE_VENDOR "MariaDB Foundation")
SET_IF_UNSET(CPACK_SOURCE_PACKAGE_FILE_NAME "mariadb-${VERSION}")
SET_IF_UNSET(CPACK_PACKAGE_CONTACT "MariaDB Developers <maria-developers@lists.launchpad.net>")
SET_IF_UNSET(CPACK_PACKAGE_VENDOR "MariaDB Foundation")
SET_IF_UNSET(CPACK_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
It is GPL v2 licensed, which means you can use the it free of charge under the
conditions of the GNU General Public License Version 2 (http://www.gnu.org/licenses/).
MariaDB documentation can be found at https://mariadb.com/kb
MariaDB bug reports should be submitted through https://jira.mariadb.org
")
SET(CPACK_SOURCE_GENERATOR "TGZ")

# Definitions for windows version resources
@@ -28,13 +28,9 @@ MACRO(CHECK_SYSTEMD)
ENDIF()
ENDIF()
IF(HAVE_DLOPEN)
SET(LIBSYSTEMD ${LIBSYSTEMD_LIBRARIES})
#SET(CMAKE_REQUIRED_FLAGS ${LIBSYSTEMD_CFLAGS})
SET(MYSQLD_LINK_FLAGS "${MYSQLD_LINK_FLAGS} ${LIBSYSTEMD_LDFLAGS}")
SET(LIBSYSTEMD ${LIBSYSTEMD_LDFLAGS} ${LIBSYSTEMD_LIBRARIES})
ELSE()
SET(LIBSYSTEMD ${LIBSYSTEMD_STATIC_LIBRARIES})
#SET(CMAKE_REQUIRED_FLAGS ${LIBSYSTEMD_STATIC_CFLAGS})
SET(MYSQLD_LINK_FLAGS "${MYSQLD_LINK_FLAGS} ${LIBSYSTEMD_STATIC_LDFLAGS}")
SET(LIBSYSTEMD ${LIBSYSTEMD_STATIC_LDFLAGS} ${LIBSYSTEMD_STATIC_LIBRARIES})
ENDIF()
ELSE()
SET(LIBSYSTEMD systemd)
@@ -234,7 +234,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)

Package: mariadb-client-core-10.4
Architecture: any
Depends: mariadb-common (>= ${source:Version}),
Depends: mariadb-common (>= ${source:Version}), libmariadb3,
${misc:Depends},
${shlibs:Depends}
Conflicts: mariadb-client-10.0,
@@ -49,9 +49,16 @@ connection default;

# We need to wait for the implicit DROP TEMPORARY TABLE to be logged after
# tmp_con disconnect, otherwise we get sporadic test failures.
# MDEV-20091: DROP TEMPORARY TABLE IF EXISTS statements will be written to
# binlog only if the corresponding temporary table exists. In row based
# replication temporary tables are not replicated hence their corresponding
# DROP TEMPORARY TABLE statement will be not be written to binary log upon
# session closure.

if (!`SELECT @@BINLOG_FORMAT = 'ROW'`) {
--let $wait_condition= SELECT variable_value > $before_drop_pos FROM information_schema.global_status WHERE variable_name = 'binlog_snapshot_position'
--source include/wait_condition.inc

}
--let $binlog_pos2=query_get_value(SHOW MASTER STATUS, Position, 1)

--let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
@@ -0,0 +1,14 @@
# ==== Purpose ====
#
# Tell mtr that all servers must be restarted after the test has
# finished.
#
# ==== Usage ====
#
# --source include/force_restart.inc
#

--let $_force_restart_datadir= `SELECT @@datadir`
--append_file $_force_restart_datadir/mtr/force_restart
1
EOF
@@ -0,0 +1,4 @@
#
# suite.pm will make sure that all tests including this file
# will be skipped as needed
#
@@ -0,0 +1,69 @@
# include/wait_condition_with_debug.inc
#
# SUMMARY
#
# Waits until the passed statement returns true, or the operation
# times out. If the operation times out, the additional error
# statement will be executed.
#
# USAGE
#
# let $wait_condition=
# SELECT c = 3 FROM t;
# let $wait_condition_on_error_output= select count(*) from t;
# [let $explicit_default_wait_timeout= N] # to override the default reset
# --source include/wait_condition_with_debug.inc
#
# OR
#
# let $wait_timeout= 60; # Override default 30 seconds with 60.
# let $wait_condition=
# SELECT c = 3 FROM t;
# let $wait_condition_on_error_output= select count(*) from t;
# --source include/wait_condition_with_debug.inc
# --echo Executed the test condition $wait_condition_reps times
#
#
# EXAMPLE
# events_bugs.test, events_time_zone.test
#

let $wait_counter= 300;
if ($wait_timeout)
{
let $wait_counter= `SELECT $wait_timeout * 10`;
}
# Reset $wait_timeout so that its value won't be used on subsequent
# calls, and default will be used instead.
if ($explicit_default_wait_timeout)
{
--let $wait_timeout= $explicit_default_wait_timeout
}
if (!$explicit_default_wait_timeout)
{
--let $wait_timeout= 0
}

# Keep track of how many times the wait condition is tested
# This is used by some tests (e.g., main.status)
let $wait_condition_reps= 0;
while ($wait_counter)
{
--error 0,ER_NO_SUCH_TABLE,ER_LOCK_WAIT_TIMEOUT,ER_UNKNOWN_COM_ERROR,ER_LOCK_DEADLOCK
let $success= `$wait_condition`;
inc $wait_condition_reps;
if ($success)
{
let $wait_counter= 0;
}
if (!$success)
{
real_sleep 0.1;
dec $wait_counter;
}
}
if (!$success)
{
echo Timeout in wait_condition.inc for $wait_condition;
--eval $wait_condition_on_error_output
}
@@ -338,6 +338,13 @@ sub new {
# Skip comment
next;
}
# Correctly process Replication Filter when they are defined
# with connection name.
elsif ( $line =~ /^([\w]+.[\w]+)\s*=\s*(.*)\s*/){
my $option= $1;
my $value= $2;
$self->insert($group_name, $option, $value);
}
else {
croak "Unexpected line '$line' found in '$path'";
}
@@ -2752,6 +2752,25 @@ DROP USER dummy@localhost;
# End of 10.2 tests
#
#
# Start of 10.3 tests
#
#
# MDEV-19948 'show grants' return privileges individually
#
CREATE USER ten2;
GRANT ALL ON *.* TO ten2;
SHOW GRANTS FOR ten2;
Grants for ten2@%
GRANT ALL PRIVILEGES ON *.* TO 'ten2'@'%'
FLUSH PRIVILEGES;
SHOW GRANTS FOR ten2;
Grants for ten2@%
GRANT ALL PRIVILEGES ON *.* TO 'ten2'@'%'
DROP USER ten2;
#
# End of 10.3 tests
#
#
# MDEV-17932 : Assertion upon double RENAME USER
#
CREATE USER foo@localhost;
@@ -2247,6 +2247,35 @@ DROP USER dummy@localhost;
--echo # End of 10.2 tests
--echo #

--echo #
--echo # Start of 10.3 tests
--echo #

--echo #
--echo # MDEV-19948 'show grants' return privileges individually
--echo #

# Let's cheat server that we are using `10.2` user table
# which doesn't have `Delete_history_priv` column

source include/switch_to_mysql_user.inc;
CREATE USER ten2;
GRANT ALL ON *.* TO ten2;

# Without any patching, this should show a lot of privileges,
# but without delete history. With patch it is showing `all privileges`
SHOW GRANTS FOR ten2;
FLUSH PRIVILEGES;

# Now should show `all privileges` with/without patch
SHOW GRANTS FOR ten2;
DROP USER ten2;
source include/switch_to_mysql_global_priv.inc;

--echo #
--echo # End of 10.3 tests
--echo #

--echo #
--echo # MDEV-17932 : Assertion upon double RENAME USER
--echo #
@@ -1,4 +1,4 @@
Windows bug: happens when a new line is exactly at the right offset.
Windows bug: new line disappears when it is exactly at the right offset.
The following options may be given as the first argument:
--print-defaults Print the program argument list and exit.
--no-defaults Don't read default options from any option file.
@@ -42,7 +42,7 @@ perl;
$re2=join('|', @plugins);
$skip=0;
open(F, '<', "$ENV{MYSQL_TMP_DIR}/mysqld--help.txt") or die;
print "Windows bug: happens when a new line is exactly at the right offset.\n";
print "Windows bug: new line disappears when it is exactly at the right offset.\n";
while (<F>) {
next if 1../The following groups are read/;
# formatting, skip line consisting entirely of dashes and blanks
@@ -1,7 +1,7 @@
create table t1 (a int) engine=myisam data directory='MYSQL_TMP_DIR';
insert t1 values (1);
# Some systems fail with errcode 40, when doing openat, while others
# don't have openat and fail with errcode 20.
# Some systems fail with errcode 40, or 90 (MIPS) when doing openat,
# while others don't have openat and fail with errcode 20.
repair table t1;
Table Op Msg_type Msg_text
test.t1 repair error 20 for record at pos 0
@@ -9,17 +9,17 @@
eval create table t1 (a int) engine=myisam data directory='$MYSQL_TMP_DIR';
insert t1 values (1);
--system ln -s $MYSQL_TMP_DIR/foobar5543 $MYSQL_TMP_DIR/t1.TMD
--echo # Some systems fail with errcode 40, when doing openat, while others
--echo # don't have openat and fail with errcode 20.
--replace_regex / '.*\/t1/ 'MYSQL_TMP_DIR\/t1/ /40/20/ /".*"/"<errmsg>"/
--echo # Some systems fail with errcode 40, or 90 (MIPS) when doing openat,
--echo # while others don't have openat and fail with errcode 20.
--replace_regex / '.*\/t1/ 'MYSQL_TMP_DIR\/t1/ /[49]0/20/ /".*"/"<errmsg>"/
repair table t1;
drop table t1;

--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
eval create table t2 (a int) engine=aria data directory='$MYSQL_TMP_DIR';
insert t2 values (1);
--system ln -s $MYSQL_TMP_DIR/foobar5543 $MYSQL_TMP_DIR/t2.TMD
--replace_regex / '.*\/t2/ 'MYSQL_TMP_DIR\/t2/ /40/20/ /".*"/"<errmsg>"/
--replace_regex / '.*\/t2/ 'MYSQL_TMP_DIR\/t2/ /[49]0/20/ /".*"/"<errmsg>"/
repair table t2;
drop table t2;

@@ -8307,6 +8307,20 @@ UNION
SELECT * FROM INFORMATION_SCHEMA.TABLES JOIN INFORMATION_SCHEMA.PARAMETERS;
DROP FUNCTION f;
DROP VIEW v;
#
# MDEV-17963: Assertion `field_pos < field_count' failed in Protocol_text::store,
# Assertion `field_handlers == 0 || field_pos < field_count'
#
CREATE TABLE t1 (ct time);
INSERT INTO t1 VALUES ('16:11:28');
CREATE FUNCTION f1 () RETURNS varchar(100)
BEGIN
DECLARE xxx varchar(100);
ANALYZE SELECT sum(ct) FROM t1 INTO xxx ;
RETURN xxx;
END|
ERROR 0A000: Not allowed to return a result set from a function
drop table t1;
#End of 10.1 tests
#
# MDEV-11081: CURSOR for query with GROUP BY
@@ -9823,6 +9823,26 @@ SELECT * FROM INFORMATION_SCHEMA.TABLES JOIN INFORMATION_SCHEMA.PARAMETERS;
DROP FUNCTION f;
DROP VIEW v;

--echo #
--echo # MDEV-17963: Assertion `field_pos < field_count' failed in Protocol_text::store,
--echo # Assertion `field_handlers == 0 || field_pos < field_count'
--echo #

CREATE TABLE t1 (ct time);
INSERT INTO t1 VALUES ('16:11:28');

DELIMITER |;
--error ER_SP_NO_RETSET
CREATE FUNCTION f1 () RETURNS varchar(100)
BEGIN
DECLARE xxx varchar(100);
ANALYZE SELECT sum(ct) FROM t1 INTO xxx ;
RETURN xxx;
END|

DELIMITER ;|
drop table t1;

--echo #End of 10.1 tests

--echo #

0 comments on commit e9c1701

Please sign in to comment.
You can’t perform that action at this time.