Commit c6d8121c authored by unknown's avatar unknown
Browse files

Merge mskold@build.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
parents 180abf83 4e639af7

libmysql/libmysql.c

+5 −5
Original line number Diff line number Diff line
@@ -1860,14 +1860,14 @@ MYSQL_STMT * STDCALL mysql_prepare(MYSQL *mysql, const char *query, 
    a server-side prepared statement. Memory for this structure (~700

    bytes) is allocated using 'malloc'. Once created, the handle can be

    reused many times. Created statement handle is bound to connection

    handle provided to this call: it's lifetime is limited by lifetime

    handle provided to this call: its lifetime is limited by lifetime

    of connection.

    'mysql_stmt_init()' is a pure local call, server side structure is

    created only in mysql_stmt_prepare.

    Next steps you may want to make:

    - set a statement attribute (mysql_stmt_attr_set()),

    - prepare statement handle with a query (mysql_stmt_prepare()),

    - close statement handle and free it's memory (mysql_stmt_close()),

    - close statement handle and free its memory (mysql_stmt_close()),

    - reset statement with mysql_stmt_reset() (a no-op which will

      just return).

    Behaviour of the rest of API calls on this statement is not defined yet
@@ -2592,7 +2592,7 @@ stmt_read_row_no_data(MYSQL_STMT *stmt __attribute__((unused)), 
    mysql_stmt_attr_get()

    mysql_stmt_attr_set()



    attr_type  statemenet attribute

    attr_type  statement attribute

    value      casted to const void * pointer to value.



  RETURN VALUE
@@ -2688,7 +2688,7 @@ int STDCALL mysql_stmt_execute(MYSQL_STMT *stmt) 
  mysql_stmt_free_result(stmt);

  /*

    No need to check for stmt->state: if the statement wasn't

    prepared we'll get 'unknown statemenet handler' error from server.

    prepared we'll get 'unknown statement handler' error from server.

  */

  if (mysql->methods->stmt_execute(stmt))

    DBUG_RETURN(1);
@@ -2813,7 +2813,7 @@ static my_bool int_is_null_false= 0; 
    By properly initializing bind array you can bind virtually any

    C language type to statement's placeholders:

    First, it's strongly recommended to always zero-initialize entire

    bind structure before setting it's members. This will both shorten

    bind structure before setting its members. This will both shorten

    your application code and make it robust to future extensions of

    MYSQL_BIND structure.

    Then you need to assign typecode of your application buffer to

mysql-test/r/func_set.result

+3 −0
Original line number Diff line number Diff line
@@ -64,3 +64,6 @@ find_in_set('a',binary 'A,B,C') 
select find_in_set(binary 'a', 'A,B,C');

find_in_set(binary 'a', 'A,B,C')

0

select find_in_set('1','3,1,');

find_in_set('1','3,1,')

2

mysql-test/t/func_set.test

+5 −0
Original line number Diff line number Diff line
@@ -47,3 +47,8 @@ select find_in_set(binary 'a',binary 'A,B,C'); 
select find_in_set('a',binary 'A,B,C');

select find_in_set(binary 'a', 'A,B,C');



#

# Bug5513:FIND_IN_SET fails if set ends with a comma

#

select find_in_set('1','3,1,');

sql/item_func.cc

+3 −2
Original line number Diff line number Diff line
@@ -1455,10 +1455,11 @@ longlong Item_func_find_in_set::val_int() 
      {

        const char *substr_end= str_end + symbol_len;

        bool is_last_item= (substr_end == real_end);

        if (wc == (my_wc_t) separator || is_last_item)

        bool is_separator= (wc == (my_wc_t) separator);

        if (is_separator || is_last_item)

        {

          position++;

          if (is_last_item)

          if (is_last_item && !is_separator)

            str_end= substr_end;

          if (!my_strnncoll(cs, (const uchar *) str_begin,

                            str_end - str_begin,