Commit 88a59c50 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.1 

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
parents 326f7175 a264a79e

client/mysqldump.c

+1 −1
Original line number Diff line number Diff line
@@ -1482,7 +1482,7 @@ static uint dump_routines_for_db(char *db) 


                query_str_tail= strnmov(query_str, row[2],

                                        definer_begin - row[2]);

                query_str_tail= strmov(query_str_tail, "*/ /*!50019");

                query_str_tail= strmov(query_str_tail, "*/ /*!50020");

                query_str_tail= strnmov(query_str_tail, definer_begin,

                                        definer_end - definer_begin);

                query_str_tail= strxmov(query_str_tail, "*/ /*!50003",

client/mysqlslap.c

+3 −3
Original line number Diff line number Diff line
@@ -296,8 +296,8 @@ int main(int argc, char **argv) 
  if (!opt_only_print) 

  {

    if (!(mysql_real_connect(&mysql, host, user, opt_password,

                             argv[0],opt_mysql_port,opt_mysql_unix_port,

                             client_flag)))

                             NULL, opt_mysql_port,

                             opt_mysql_unix_port, client_flag)))

    {

      fprintf(stderr,"%s: %s\n",my_progname,mysql_error(&mysql));

      free_defaults(defaults_argv);

include/my_base.h

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ enum ha_base_keytype { 
#define HA_STATE_BUFF_SAVED	512	/* If current keybuff is info->buff */

#define HA_STATE_ROW_CHANGED	1024	/* To invalide ROW cache */

#define HA_STATE_EXTEND_BLOCK	2048

#define HA_STATE_RNEXT_SAME	4096	/* rnext_same was called */

#define HA_STATE_RNEXT_SAME	4096	/* rnext_same occupied lastkey2 */



/* myisampack expects no more than 32 field types. */

enum en_fieldtype {

include/my_no_pthread.h

+24 −4
Original line number Diff line number Diff line
@@ -14,15 +14,34 @@ 
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */





#if !defined(_my_no_pthread_h) && !defined(THREAD)

#define _my_no_pthread_h





/*

  This block is to access some thread-related type definitions

  even in builds which do not need thread functions,

  as some variables (based on these types) are declared

  even in non-threaded builds.

  Case in point: 'mf_keycache.c'

*/

#if defined(__WIN__) || defined(OS2)



#elif defined(HAVE_UNIXWARE7_THREADS)

/* #include <thread.h>   Currently, not relevant. Enable if needed. */



#else /* Normal threads */

#include <pthread.h>



#endif /* defined(__WIN__) */





/*

  This undefs some pthread mutex locks when one isn't using threads

  to make thread safe code, that should also work in single thread

  environment, easier to use.

*/



#if !defined(_my_no_pthread_h) && !defined(THREAD)

#define _my_no_pthread_h



#define pthread_mutex_init(A,B)

#define pthread_mutex_lock(A)

#define pthread_mutex_unlock(A)
@@ -32,4 +51,5 @@ 
#define rw_wrlock(A)

#define rw_unlock(A)

#define rwlock_destroy(A)



#endif

libmysql/libmysql.c

+0 −1
Original line number Diff line number Diff line
@@ -2816,7 +2816,6 @@ my_bool STDCALL mysql_stmt_attr_get(MYSQL_STMT *stmt, 
{

  switch (attr_type) {

  case STMT_ATTR_UPDATE_MAX_LENGTH:

    *(my_bool*) value= stmt->update_max_length;

    break;

  case STMT_ATTR_CURSOR_TYPE:

    *(ulong*) value= stmt->flags;