MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:konstantin Date:October 24 2005 4:30pm
Subject:bk commit into 5.0 tree (konstantin:1.2012)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2012 05/10/24 20:30:38 konstantin@stripped +2 -0
  Fix coding style.

  plugin/fulltext/cnet_weight.c
    1.4 05/10/24 20:30:29 konstantin@stripped +10 -7
    Fix coding style.

  plugin/fulltext/cnet_parser.c
    1.6 05/10/24 20:30:29 konstantin@stripped +5 -4
    Fix coding style.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-cnet

--- 1.5/plugin/fulltext/cnet_parser.c	2005-10-24 20:02:29 +04:00
+++ 1.6/plugin/fulltext/cnet_parser.c	2005-10-24 20:30:29 +04:00
@@ -16,7 +16,7 @@
 
 static char *words_buf;
 static const char **words;
-static size_t nwords; 
+static size_t nwords;
 static int min_word_len= 3;
 static char *synonyms[][2]=
 {
@@ -39,7 +39,7 @@
 }
 
 
-static int cnet_parser_init_once (void)
+static int cnet_parser_init_once(void)
 {
   int fd;
   off_t len;
@@ -84,7 +84,7 @@
 }
 
 
-static int cnet_parser_deinit_once (void)
+static int cnet_parser_deinit_once(void)
 {
   free(words_buf);
   free(words);
@@ -106,7 +106,7 @@
 
 
 static void add_word(MYSQL_FTPARSER_PARAM *param, char *word,
-    size_t length)
+                     size_t length)
 {
   MYSQL_FTPARSER_BOOLEAN_INFO boolean_info=
     { FT_CHUNK_TYPE_WORD, 1, 0, 0, 0, ' ', 0 };
@@ -171,6 +171,7 @@
 {
   MYSQL_FTPARSER_INTERFACE_VERSION, cnet_parser_parse, 0, 0
 };
+
 
 mysql_declare_plugin
 {

--- 1.3/plugin/fulltext/cnet_weight.c	2005-10-18 13:50:39 +04:00
+++ 1.4/plugin/fulltext/cnet_weight.c	2005-10-24 20:30:29 +04:00
@@ -57,7 +57,7 @@
 */
 
 static int query_add_word(void *param, byte *word, uint word_len,
-    MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info)
+                          MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info)
 {
   CNET_WEIGHT_PARAM *a= (CNET_WEIGHT_PARAM *)param;
   a->query= realloc(a->query, (a->nwords + 1) * sizeof(CNET_STRING));
@@ -93,7 +93,7 @@
 */
 
 my_bool cnet_weight_init(UDF_INIT *initid, UDF_ARGS *args,
-    char *message)
+                         char *message)
 {
   MYSQL_FTPARSER_PARAM param;
   if (args->arg_count != 2 || args->arg_type[0] != STRING_RESULT ||
@@ -144,7 +144,8 @@
 void cnet_weight_deinit(UDF_INIT *initid)
 {
   CNET_WEIGHT_PARAM *a= (CNET_WEIGHT_PARAM *)initid->ptr;
-  if (a->query) free(a->query);
+  if (a->query)
+    free(a->query);
   free(initid->ptr);
 }
 
@@ -162,8 +163,10 @@
     This function performs relevancy calculation.
 */
 
-static int document_add_word(void *param, byte *word, uint word_len,
-    MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info __attribute__((unused)))
+static int
+document_add_word(void *param, byte *word, uint word_len,
+                  MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info
+                  __attribute__((unused)))
 {
   CNET_WEIGHT_PARAM *weight_param= (CNET_WEIGHT_PARAM *)param;
   uint idx, match= 0;
@@ -172,7 +175,7 @@
   /*
     Compare each word from the query with current word from the
     document.
-  */ 
+  */
   for (idx= 0; idx < weight_param->nwords; idx++)
   {
     CNET_STRING *qwrd= &weight_param->query[idx];
@@ -231,7 +234,7 @@
 */
 
 double cnet_weight(UDF_INIT *initid, UDF_ARGS *args,
-    char *is_null, char *error)
+                   char *is_null, char *error)
 {
   MYSQL_FTPARSER_PARAM param;
   CNET_WEIGHT_PARAM *weight_param= (CNET_WEIGHT_PARAM *)initid->ptr;
Thread
bk commit into 5.0 tree (konstantin:1.2012)konstantin24 Oct