OpenSDE
/
rocklinux
mirror of https://github.com/amery/rocklinux.git
2
0
Fork 0
Code Releases Wiki Activity
mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
4152 Commits
1 Branch
0 Tags
34 MiB
Tree: 8f85cb8d1c
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '8f85cb8d1c'
${ noResults }
rocklinux/package/clifford/mysql/linux-2.6.10.patch

272 lines
8.5 KiB
Raw Normal View History

Stefan Fiedler: mysql: patch for linux 2.6.10 - in client/mysqltest.c, mysqld/examples/mysqltest.c and extra/replace.c, rename set_bit() to set_bit_() and clear_bit() to clear_bit_(), to avoid conflicts with functions from /usr/include/asm/bitops.h - in includes/my_global.h, explicitly #define CONFIG_NR_CPUS; this should really be a command line option to gcc (-D CONFIG_NR_CPUS=1) and have the same value as in the linux config for SMP machines linux: rename the variable 'new' in include/asm-i386/system.h to something else to avoid errors with g++ Index: package/base/linux/linux26/76-no-new-variable.patch =================================================================== [2005010401052224873] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5495 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
20 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
  1. diff -dur mysql-4.1.7/client/mysqltest.c src.mysql.1104350495.30814.396807788/mysql-4.1.7/client/mysqltest.c
  2. --- mysql-4.1.7/client/mysqltest.c 2004-10-23 07:28:47.000000000 +0000
  3. +++ src.mysql.1104350495.30814.396807788/mysql-4.1.7/client/mysqltest.c 2004-12-30 02:35:57.000000000 +0000
  4. @@ -3272,8 +3272,8 @@
  5. static void make_sets_invisible(REP_SETS *sets);
  6. static void free_last_set(REP_SETS *sets);
  7. static void free_sets(REP_SETS *sets);
  8. -static void set_bit(REP_SET *set, uint bit);
  9. -static void clear_bit(REP_SET *set, uint bit);
  10. +static void set_bit_(REP_SET *set, uint bit);
  11. +static void clear_bit_(REP_SET *set, uint bit);
  12. static void or_bits(REP_SET *to,REP_SET *from);
  13. static void copy_bits(REP_SET *to,REP_SET *from);
  14. static int cmp_bits(REP_SET *set1,REP_SET *set2);
  15. @@ -3350,7 +3350,7 @@
  16. {
  17. if (from[i][0] == '\\' && from[i][1] == '^')
  18. {
  19. - set_bit(start_states,states+1);
  20. + set_bit_(start_states,states+1);
  21. if (!from[i][2])
  22. {
  23. start_states->table_offset=i;
  24. @@ -3359,8 +3359,8 @@
  25. }
  26. else if (from[i][0] == '\\' && from[i][1] == '$')
  27. {
  28. - set_bit(start_states,states);
  29. - set_bit(word_states,states);
  30. + set_bit_(start_states,states);
  31. + set_bit_(word_states,states);
  32. if (!from[i][2] && start_states->table_offset == (uint) ~0)
  33. {
  34. start_states->table_offset=i;
  35. @@ -3369,11 +3369,11 @@
  36. }
  37. else
  38. {
  39. - set_bit(word_states,states);
  40. + set_bit_(word_states,states);
  41. if (from[i][0] == '\\' && (from[i][1] == 'b' && from[i][2]))
  42. - set_bit(start_states,states+1);
  43. + set_bit_(start_states,states+1);
  44. else
  45. - set_bit(start_states,states);
  46. + set_bit_(start_states,states);
  47. }
  48. for (pos=from[i], len=0; *pos ; pos++)
  49. {
  50. @@ -3479,9 +3479,9 @@
  51. follow[i].len > found_end)
  52. found_end=follow[i].len;
  53. if (chr && follow[i].chr)
  54. - set_bit(new_set,i+1); /* To next set */
  55. + set_bit_(new_set,i+1); /* To next set */
  56. else
  57. - set_bit(new_set,i);
  58. + set_bit_(new_set,i);
  59. }
  60. }
  61. if (found_end)
  62. @@ -3498,7 +3498,7 @@
  63. if (follow[bit_nr-1].len < found_end ||
  64. (new_set->found_len &&
  65. (chr == 0 || !follow[bit_nr].chr)))
  66. - clear_bit(new_set,i);
  67. + clear_bit_(new_set,i);
  68. else
  69. {
  70. if (chr == 0 || !follow[bit_nr].chr)
  71. @@ -3647,13 +3647,13 @@
  72. return;
  73. }
  75. -static void set_bit(REP_SET *set, uint bit)
  76. +static void set_bit_(REP_SET *set, uint bit)
  77. {
  78. set->bits[bit / WORD_BIT] |= 1 << (bit % WORD_BIT);
  79. return;
  80. }
  82. -static void clear_bit(REP_SET *set, uint bit)
  83. +static void clear_bit_(REP_SET *set, uint bit)
  84. {
  85. set->bits[bit / WORD_BIT] &= ~ (1 << (bit % WORD_BIT));
  86. return;
  87. diff -dur mysql-4.1.7/extra/replace.c src.mysql.1104350495.30814.396807788/mysql-4.1.7/extra/replace.c
  88. --- mysql-4.1.7/extra/replace.c 2004-10-23 07:28:45.000000000 +0000
  89. +++ src.mysql.1104350495.30814.396807788/mysql-4.1.7/extra/replace.c 2004-12-29 21:06:28.000000000 +0000
  90. @@ -376,8 +376,8 @@
  91. static void make_sets_invisible(REP_SETS *sets);
  92. static void free_last_set(REP_SETS *sets);
  93. static void free_sets(REP_SETS *sets);
  94. -static void set_bit(REP_SET *set, uint bit);
  95. -static void clear_bit(REP_SET *set, uint bit);
  96. +static void set_bit_(REP_SET *set, uint bit);
  97. +static void clear_bit_(REP_SET *set, uint bit);
  98. static void or_bits(REP_SET *to,REP_SET *from);
  99. static void copy_bits(REP_SET *to,REP_SET *from);
  100. static int cmp_bits(REP_SET *set1,REP_SET *set2);
  101. @@ -454,7 +454,7 @@
  102. {
  103. if (from[i][0] == '\\' && from[i][1] == '^')
  104. {
  105. - set_bit(start_states,states+1);
  106. + set_bit_(start_states,states+1);
  107. if (!from[i][2])
  108. {
  109. start_states->table_offset=i;
  110. @@ -463,8 +463,8 @@
  111. }
  112. else if (from[i][0] == '\\' && from[i][1] == '$')
  113. {
  114. - set_bit(start_states,states);
  115. - set_bit(word_states,states);
  116. + set_bit_(start_states,states);
  117. + set_bit_(word_states,states);
  118. if (!from[i][2] && start_states->table_offset == (uint) ~0)
  119. {
  120. start_states->table_offset=i;
  121. @@ -473,11 +473,11 @@
  122. }
  123. else
  124. {
  125. - set_bit(word_states,states);
  126. + set_bit_(word_states,states);
  127. if (from[i][0] == '\\' && (from[i][1] == 'b' && from[i][2]))
  128. - set_bit(start_states,states+1);
  129. + set_bit_(start_states,states+1);
  130. else
  131. - set_bit(start_states,states);
  132. + set_bit_(start_states,states);
  133. }
  134. for (pos=from[i], len=0; *pos ; pos++)
  135. {
  136. @@ -583,9 +583,9 @@
  137. follow[i].len > found_end)
  138. found_end=follow[i].len;
  139. if (chr && follow[i].chr)
  140. - set_bit(new_set,i+1); /* To next set */
  141. + set_bit_(new_set,i+1); /* To next set */
  142. else
  143. - set_bit(new_set,i);
  144. + set_bit_(new_set,i);
  145. }
  146. }
  147. if (found_end)
  148. @@ -602,7 +602,7 @@
  149. if (follow[bit_nr-1].len < found_end ||
  150. (new_set->found_len &&
  151. (chr == 0 || !follow[bit_nr].chr)))
  152. - clear_bit(new_set,i);
  153. + clear_bit_(new_set,i);
  154. else
  155. {
  156. if (chr == 0 || !follow[bit_nr].chr)
  157. @@ -751,13 +751,13 @@
  158. return;
  159. }
  161. -static void set_bit(REP_SET *set, uint bit)
  162. +static void set_bit_(REP_SET *set, uint bit)
  163. {
  164. set->bits[bit / WORD_BIT] |= 1 << (bit % WORD_BIT);
  165. return;
  166. }
  168. -static void clear_bit(REP_SET *set, uint bit)
  169. +static void clear_bit_(REP_SET *set, uint bit)
  170. {
  171. set->bits[bit / WORD_BIT] &= ~ (1 << (bit % WORD_BIT));
  172. return;
  173. diff -dur mysql-4.1.7/include/my_global.h src.mysql.1104350495.30814.396807788/mysql-4.1.7/include/my_global.h
  174. --- mysql-4.1.7/include/my_global.h 2004-10-23 07:28:43.000000000 +0000
  175. +++ src.mysql.1104350495.30814.396807788/mysql-4.1.7/include/my_global.h 2004-12-29 20:48:37.000000000 +0000
  176. @@ -287,9 +287,8 @@
  177. #ifndef CONFIG_SMP
  178. #define CONFIG_SMP
  179. #endif
  180. -C_MODE_START
  181. +#define CONFIG_NR_CPUS 1
  182. #include <asm/atomic.h>
  183. -C_MODE_END
  184. #endif
  185. #include <errno.h> /* Recommended by debian */
  186. /* We need the following to go around a problem with openssl on solaris */
  187. diff -dur mysql-4.1.7/libmysqld/examples/mysqltest.c src.mysql.1104350495.30814.396807788/mysql-4.1.7/libmysqld/examples/mysqltest.c
  188. --- mysql-4.1.7/libmysqld/examples/mysqltest.c 2004-10-23 07:28:47.000000000 +0000
  189. +++ src.mysql.1104350495.30814.396807788/mysql-4.1.7/libmysqld/examples/mysqltest.c 2004-12-30 02:35:57.000000000 +0000
  190. @@ -3272,8 +3272,8 @@
  191. static void make_sets_invisible(REP_SETS *sets);
  192. static void free_last_set(REP_SETS *sets);
  193. static void free_sets(REP_SETS *sets);
  194. -static void set_bit(REP_SET *set, uint bit);
  195. -static void clear_bit(REP_SET *set, uint bit);
  196. +static void set_bit_(REP_SET *set, uint bit);
  197. +static void clear_bit_(REP_SET *set, uint bit);
  198. static void or_bits(REP_SET *to,REP_SET *from);
  199. static void copy_bits(REP_SET *to,REP_SET *from);
  200. static int cmp_bits(REP_SET *set1,REP_SET *set2);
  201. @@ -3350,7 +3350,7 @@
  202. {
  203. if (from[i][0] == '\\' && from[i][1] == '^')
  204. {
  205. - set_bit(start_states,states+1);
  206. + set_bit_(start_states,states+1);
  207. if (!from[i][2])
  208. {
  209. start_states->table_offset=i;
  210. @@ -3359,8 +3359,8 @@
  211. }
  212. else if (from[i][0] == '\\' && from[i][1] == '$')
  213. {
  214. - set_bit(start_states,states);
  215. - set_bit(word_states,states);
  216. + set_bit_(start_states,states);
  217. + set_bit_(word_states,states);
  218. if (!from[i][2] && start_states->table_offset == (uint) ~0)
  219. {
  220. start_states->table_offset=i;
  221. @@ -3369,11 +3369,11 @@
  222. }
  223. else
  224. {
  225. - set_bit(word_states,states);
  226. + set_bit_(word_states,states);
  227. if (from[i][0] == '\\' && (from[i][1] == 'b' && from[i][2]))
  228. - set_bit(start_states,states+1);
  229. + set_bit_(start_states,states+1);
  230. else
  231. - set_bit(start_states,states);
  232. + set_bit_(start_states,states);
  233. }
  234. for (pos=from[i], len=0; *pos ; pos++)
  235. {
  236. @@ -3479,9 +3479,9 @@
  237. follow[i].len > found_end)
  238. found_end=follow[i].len;
  239. if (chr && follow[i].chr)
  240. - set_bit(new_set,i+1); /* To next set */
  241. + set_bit_(new_set,i+1); /* To next set */
  242. else
  243. - set_bit(new_set,i);
  244. + set_bit_(new_set,i);
  245. }
  246. }
  247. if (found_end)
  248. @@ -3498,7 +3498,7 @@
  249. if (follow[bit_nr-1].len < found_end ||
  250. (new_set->found_len &&
  251. (chr == 0 || !follow[bit_nr].chr)))
  252. - clear_bit(new_set,i);
  253. + clear_bit_(new_set,i);
  254. else
  255. {
  256. if (chr == 0 || !follow[bit_nr].chr)
  257. @@ -3647,13 +3647,13 @@
  258. return;
  259. }
  261. -static void set_bit(REP_SET *set, uint bit)
  262. +static void set_bit_(REP_SET *set, uint bit)
  263. {
  264. set->bits[bit / WORD_BIT] |= 1 << (bit % WORD_BIT);
  265. return;
  266. }
  268. -static void clear_bit(REP_SET *set, uint bit)
  269. +static void clear_bit_(REP_SET *set, uint bit)
  270. {
  271. set->bits[bit / WORD_BIT] &= ~ (1 << (bit % WORD_BIT));
  272. return;