Commit c941b9f3 authored by anozdrin/alik@quad.opbmk's avatar anozdrin/alik@quad.opbmk
Browse files

Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0 

into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt-merged
parents 6a4c4b18 3958a755

include/my_pthread.h

+4 −4
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ extern int pthread_mutex_destroy (pthread_mutex_t *); 
#define pthread_mutex_unlock(A)  LeaveCriticalSection(A)

#define pthread_mutex_destroy(A) DeleteCriticalSection(A)

#define my_pthread_setprio(A,B)  SetThreadPriority(GetCurrentThread(), (B))

#define pthread_kill(A,B) pthread_dummy(ESRCH)

#define pthread_kill(A,B) pthread_dummy((A) ? 0 : ESRCH)

#endif /* OS2 */



/* Dummy defines for easier code */
@@ -445,14 +445,14 @@ struct tm *gmtime_r(const time_t *clock, struct tm *res); 
#define pthread_attr_setdetachstate(A,B) pthread_dummy(0)

#define pthread_create(A,B,C,D) pthread_create((A),*(B),(C),(D))

#define pthread_sigmask(A,B,C) sigprocmask((A),(B),(C))

#define pthread_kill(A,B) pthread_dummy(ESRCH)

#define pthread_kill(A,B) pthread_dummy((A) ? 0 : ESRCH)

#undef	pthread_detach_this_thread

#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(&tmp); }

#endif



#ifdef HAVE_DARWIN5_THREADS

#define pthread_sigmask(A,B,C) sigprocmask((A),(B),(C))

#define pthread_kill(A,B) pthread_dummy(ESRCH)

#define pthread_kill(A,B) pthread_dummy((A) ? 0 : ESRCH)

#define pthread_condattr_init(A) pthread_dummy(0)

#define pthread_condattr_destroy(A) pthread_dummy(0)

#undef	pthread_detach_this_thread
@@ -472,7 +472,7 @@ struct tm *gmtime_r(const time_t *clock, struct tm *res); 
#ifndef pthread_sigmask

#define pthread_sigmask(A,B,C) sigprocmask((A),(B),(C))

#endif

#define pthread_kill(A,B) pthread_dummy(ESRCH)

#define pthread_kill(A,B) pthread_dummy((A) ? 0 : ESRCH)

#undef	pthread_detach_this_thread

#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(&tmp); }

#elif !defined(__NETWARE__) /* HAVE_PTHREAD_ATTR_CREATE && !HAVE_SIGWAIT */

libmysql/libmysql.c

+12 −5
Original line number Diff line number Diff line
@@ -2456,7 +2456,7 @@ static my_bool execute(MYSQL_STMT *stmt, char *packet, ulong length) 
  int4store(buff+5, 1);                         /* iteration count */



  res= test(cli_advanced_command(mysql, COM_STMT_EXECUTE, buff, sizeof(buff),

                                 packet, length, 1, NULL) ||

                                 packet, length, 1, stmt) ||

            (*mysql->methods->read_query_result)(mysql));

  stmt->affected_rows= mysql->affected_rows;

  stmt->server_status= mysql->server_status;
@@ -2673,7 +2673,7 @@ stmt_read_row_from_cursor(MYSQL_STMT *stmt, unsigned char **row) 
    int4store(buff + 4, stmt->prefetch_rows); /* number of rows to fetch */

    if ((*mysql->methods->advanced_command)(mysql, COM_STMT_FETCH,

                                            buff, sizeof(buff), NullS, 0,

                                            1, NULL))

                                            1, stmt))

    {

      set_stmt_errmsg(stmt, net->last_error, net->last_errno, net->sqlstate);

      return 1;
@@ -3340,7 +3340,7 @@ mysql_stmt_send_long_data(MYSQL_STMT *stmt, uint param_number, 
    */

    if ((*mysql->methods->advanced_command)(mysql, COM_STMT_SEND_LONG_DATA,

                                            buff, sizeof(buff), data,

                                            length, 1, NULL))

                                            length, 1, stmt))

    {

      set_stmt_errmsg(stmt, mysql->net.last_error,

		      mysql->net.last_errno, mysql->net.sqlstate);
@@ -4737,6 +4737,13 @@ int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt) 
  MYSQL_DATA *result= &stmt->result;

  DBUG_ENTER("mysql_stmt_store_result");



  if (!mysql)

  {

    /* mysql can be reset in mysql_close called from mysql_reconnect */

    set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate);

    DBUG_RETURN(1);

  }



  mysql= mysql->last_used_con;



  if (!stmt->field_count)
@@ -4762,7 +4769,7 @@ int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt) 
    int4store(buff, stmt->stmt_id);

    int4store(buff + 4, (int)~0); /* number of rows to fetch */

    if (cli_advanced_command(mysql, COM_STMT_FETCH, buff, sizeof(buff),

                             NullS, 0, 1, NULL))

                             NullS, 0, 1, stmt))

    {

      set_stmt_errmsg(stmt, net->last_error, net->last_errno, net->sqlstate);

      DBUG_RETURN(1);
@@ -4949,7 +4956,7 @@ static my_bool reset_stmt_handle(MYSQL_STMT *stmt, uint flags) 
        char buff[MYSQL_STMT_HEADER]; /* packet header: 4 bytes for stmt id */

        int4store(buff, stmt->stmt_id);

        if ((*mysql->methods->advanced_command)(mysql, COM_STMT_RESET, buff,

                                                sizeof(buff), 0, 0, 0, NULL))

                                                sizeof(buff), 0, 0, 0, stmt))

        {

          set_stmt_errmsg(stmt, mysql->net.last_error, mysql->net.last_errno,

                          mysql->net.sqlstate);

mysql-test/r/trigger-trans.result

+19 −0
Original line number Diff line number Diff line
@@ -140,4 +140,23 @@ select * from t3; 
c

1

drop table t1, t2, t3;

DROP TABLE IF EXISTS t1;

DROP TABLE IF EXISTS t2;

CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=innodb;

CREATE TABLE t2(b INT, FOREIGN KEY(b) REFERENCES t1(a)) ENGINE=innodb;

INSERT INTO t1 VALUES (1);

CREATE TRIGGER t1_bd BEFORE DELETE ON t1 FOR EACH ROW SET @a = 1;

CREATE TRIGGER t1_ad AFTER DELETE ON t1 FOR EACH ROW SET @b = 1;

SET @a = 0;

SET @b = 0;

TRUNCATE t1;

SELECT @a, @b;

@a	@b

0	0

INSERT INTO t1 VALUES (1);

DELETE FROM t1;

SELECT @a, @b;

@a	@b

1	1

DROP TABLE t2, t1;

End of 5.0 tests

mysql-test/t/mysql_client_test.test

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 
# server or run mysql-test-run --debug mysql_client_test and check

# var/log/mysql_client_test.trace



--exec echo "$MYSQL_CLIENT_TEST" > $MYSQLTEST_VARDIR/log/mysql_client_test.log 2>&1

--exec $MYSQL_CLIENT_TEST --getopt-ll-test=25600M >> $MYSQLTEST_VARDIR/log/mysql_client_test.log 2>&1

--exec echo "$MYSQL_CLIENT_TEST" > $MYSQLTEST_VARDIR/log/mysql_client_test.out.log 2>&1

--exec $MYSQL_CLIENT_TEST --getopt-ll-test=25600M >> $MYSQLTEST_VARDIR/log/mysql_client_test.out.log 2>&1



# End of 4.1 tests

echo ok;

mysql-test/t/trigger-trans.test

+32 −0
Original line number Diff line number Diff line
@@ -128,5 +128,37 @@ drop table t1, t2, t3; 
disconnect connection_update;

disconnect connection_aux;



#

# Bug#34643: TRUNCATE crash if trigger and foreign key.

#



--disable_warnings

DROP TABLE IF EXISTS t1;

DROP TABLE IF EXISTS t2;

--enable_warnings



CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=innodb;

CREATE TABLE t2(b INT, FOREIGN KEY(b) REFERENCES t1(a)) ENGINE=innodb;



INSERT INTO t1 VALUES (1);



CREATE TRIGGER t1_bd BEFORE DELETE ON t1 FOR EACH ROW SET @a = 1;

CREATE TRIGGER t1_ad AFTER DELETE ON t1 FOR EACH ROW SET @b = 1;



SET @a = 0;

SET @b = 0;



TRUNCATE t1;



SELECT @a, @b;



INSERT INTO t1 VALUES (1);



DELETE FROM t1;



SELECT @a, @b;



DROP TABLE t2, t1;





--echo End of 5.0 tests