mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

Browse source
This commit is contained in:
monty@hundin.mysql.fi 2002-08-09 00:06:15 +03:00
commit a40b21fe4b
2 changed files with 6 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/sslopt-case.h
View file

@ -22,25 +22,27 @@
opt_use_ssl = 1; /* true */
/* QQ to be removed??? my_free(opt_ssl_key, MYF(MY_ALLOW_ZERO_PTR)); */
/* QQ to be removed??? opt_ssl_key = my_strdup(optarg, MYF(0)); */
my_free(opt_ssl_key, MYF(MY_ALLOW_ZERO_PTR));
opt_ssl_key = my_strdup(argument, MYF(0));
break;
case OPT_SSL_CERT:
opt_use_ssl = 1; /* true */
my_free(opt_ssl_cert, MYF(MY_ALLOW_ZERO_PTR));
opt_ssl_cert = my_strdup(optarg, MYF(0));
opt_ssl_cert = my_strdup(argument, MYF(0));
break;
case OPT_SSL_CA:
opt_use_ssl = 1; /* true */
my_free(opt_ssl_ca, MYF(MY_ALLOW_ZERO_PTR));
opt_ssl_ca = my_strdup(optarg, MYF(0));
opt_ssl_ca = my_strdup(argument, MYF(0));
break;
case OPT_SSL_CAPATH:
opt_use_ssl = 1; /* true */
my_free(opt_ssl_capath, MYF(MY_ALLOW_ZERO_PTR));
opt_ssl_capath = my_strdup(optarg, MYF(0));
opt_ssl_capath = my_strdup(argument, MYF(0));
break;
case OPT_SSL_CIPHER:
opt_use_ssl = 1; /* true */
my_free(opt_ssl_cipher, MYF(MY_ALLOW_ZERO_PTR));
opt_ssl_cipher = my_strdup(optarg, MYF(0));
opt_ssl_cipher = my_strdup(argument, MYF(0));
break;
#endif

26
myisam/ft_static.c
View file

@ -76,7 +76,6 @@ const char *ft_precompiled_stopwords[] = {
it was slightly modified to my taste, though
*/
"a",
"a's",
"able",
"about",
@ -130,7 +129,6 @@ const char *ft_precompiled_stopwords[] = {
"available",
"away",
"awfully",
"b",
"be",
"became",
"because",
@ -154,7 +152,6 @@ const char *ft_precompiled_stopwords[] = {
"brief",
"but",
"by",
"c",
"c'mon",
"c's",
"came",
@ -184,7 +181,6 @@ const char *ft_precompiled_stopwords[] = {
"couldn't",
"course",
"currently",
"d",
"definitely",
"described",
"despite",
@ -200,7 +196,6 @@ const char *ft_precompiled_stopwords[] = {
"down",
"downwards",
"during",
"e",
"each",
"edu",
"eg",
@ -224,7 +219,6 @@ const char *ft_precompiled_stopwords[] = {
"exactly",
"example",
"except",
"f",
"far",
"few",
"fifth",
@ -241,7 +235,6 @@ const char *ft_precompiled_stopwords[] = {
"from",
"further",
"furthermore",
"g",
"get",
"gets",
"getting",
@ -254,7 +247,6 @@ const char *ft_precompiled_stopwords[] = {
"got",
"gotten",
"greetings",
"h",
"had",
"hadn't",
"happens",
@ -287,7 +279,6 @@ const char *ft_precompiled_stopwords[] = {
"how",
"howbeit",
"however",
"i",
"i'd",
"i'll",
"i'm",
@ -316,16 +307,13 @@ const char *ft_precompiled_stopwords[] = {
"it's",
"its",
"itself",
"j",
"just",
"k",
"keep",
"keeps",
"kept",
"know",
"knows",
"known",
"l",
"last",
"lately",
"later",
@ -344,7 +332,6 @@ const char *ft_precompiled_stopwords[] = {
"looking",
"looks",
"ltd",
"m",
"mainly",
"many",
"may",
@ -362,7 +349,6 @@ const char *ft_precompiled_stopwords[] = {
"must",
"my",
"myself",
"n",
"name",
"namely",
"nd",
@ -389,7 +375,6 @@ const char *ft_precompiled_stopwords[] = {
"novel",
"now",
"nowhere",
"o",
"obviously",
"of",
"off",
@ -417,7 +402,6 @@ const char *ft_precompiled_stopwords[] = {
"over",
"overall",
"own",
"p",
"particular",
"particularly",
"per",
@ -429,11 +413,9 @@ const char *ft_precompiled_stopwords[] = {
"presumably",
"probably",
"provides",
"q",
"que",
"quite",
"qv",
"r",
"rather",
"rd",
"re",
@ -445,7 +427,6 @@ const char *ft_precompiled_stopwords[] = {
"relatively",
"respectively",
"right",
"s",
"said",
"same",
"saw",
@ -495,7 +476,6 @@ const char *ft_precompiled_stopwords[] = {
"such",
"sup",
"sure",
"t",
"t's",
"take",
"taken",
@ -555,7 +535,6 @@ const char *ft_precompiled_stopwords[] = {
"trying",
"twice",
"two",
"u",
"un",
"under",
"unfortunately",
@ -572,14 +551,12 @@ const char *ft_precompiled_stopwords[] = {
"uses",
"using",
"usually",
"v",
"value",
"various",
"very",
"via",
"viz",
"vs",
"w",
"want",
"wants",
"was",
@ -631,8 +608,6 @@ const char *ft_precompiled_stopwords[] = {
"would",
"would",
"wouldn't",
"x",
"y",
"yes",
"yet",
"you",
@ -644,7 +619,6 @@ const char *ft_precompiled_stopwords[] = {
"yours",
"yourself",
"yourselves",
"z",
"zero",
#endif