Commit 38069031 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mysql_src/mysql-5.0-van 

into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
(2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).


configure.in:
  Auto merged
mysql-test/r/ndb_charset.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysys/base64.c:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/ndb/include/kernel/AttributeDescriptor.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/tools/ndb_size.pl:
  Auto merged
storage/ndb/tools/ndb_size.tmpl:
  Auto merged
mysql-test/t/disabled.def:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  used "ul", Pekka said he'll fix
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  used "ul", Pekka said he'll fix
parents a06f394e 6ba79a25

client/mysql.cc

+7 −3
Original line number Diff line number Diff line
@@ -1872,9 +1872,13 @@ com_help(String *buffer __attribute__((unused)), 
  if (help_arg)

    return com_server_help(buffer,line,help_arg+1);



  put_info("\nFor the complete MySQL Manual online, visit:\n   http://www.mysql.com/documentation\n", INFO_INFO);

  put_info("For info on technical support from MySQL developers, visit:\n   http://www.mysql.com/support\n", INFO_INFO);

  put_info("For info on MySQL books, utilities, consultants, etc., visit:\n   http://www.mysql.com/portal\n", INFO_INFO);

  put_info("\nFor information about MySQL products and services, visit:\n"

           "   http://www.mysql.com/\n"

           "For developer information, including the MySQL Reference Manual, "

           "visit:\n"

           "   http://dev.mysql.com/\n"

           "To buy MySQL Network Support, training, or other products, visit:\n"

           "   https://shop.mysql.com/\n", INFO_INFO);

  put_info("List of all MySQL commands:", INFO_INFO);

  if (!named_cmds)

    put_info("Note that all text commands must be first on line and end with ';'",INFO_INFO);

configure.in

+13 −0
Original line number Diff line number Diff line
@@ -1537,6 +1537,19 @@ if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then 
  OPTIMIZE_CXXFLAGS="-O3 -DNDEBUG"

fi



# If the user specified CFLAGS, we won't add any optimizations

if test -n "$SAVE_CFLAGS"

then

  OPTIMIZE_CFLAGS=""

  DEBUG_OPTIMIZE_CC=""

fi

# Ditto for CXXFLAGS

if test -n "$SAVE_CXXFLAGS"

then

  OPTIMIZE_CXXFLAGS=""

  DEBUG_OPTIMIZE_CXX=""

fi



AC_ARG_WITH(debug,

    [  --without-debug         Build a production version without debugging code],

    [with_debug=$withval],

include/my_pthread.h

+7 −1
Original line number Diff line number Diff line
@@ -536,9 +536,15 @@ void safe_mutex_end(FILE *file); 
#define pthread_cond_timedwait(A,B,C) safe_cond_timedwait((A),(B),(C),__FILE__,__LINE__)

#define pthread_mutex_trylock(A) pthread_mutex_lock(A)

#define pthread_mutex_t safe_mutex_t

#define safe_mutex_assert_owner(mp) DBUG_ASSERT((mp)->count > 0 && pthread_equal(pthread_self(),(mp)->thread))

#define safe_mutex_assert_owner(mp) \

          DBUG_ASSERT((mp)->count > 0 && \

                      pthread_equal(pthread_self(), (mp)->thread))

#define safe_mutex_assert_not_owner(mp) \

          DBUG_ASSERT(! (mp)->count || \

                      ! pthread_equal(pthread_self(), (mp)->thread))

#else

#define safe_mutex_assert_owner(mp)

#define safe_mutex_assert_not_owner(mp)

#endif /* SAFE_MUTEX */



	/* READ-WRITE thread locking */

mysql-test/r/analyze.result

+7 −0
Original line number Diff line number Diff line
@@ -30,3 +30,10 @@ check table t1; 
Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

CREATE TABLE t1 (a int);

prepare stmt1 from "SELECT * FROM t1 PROCEDURE ANALYSE()";

execute stmt1;

Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype

execute stmt1;

Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype

deallocate prepare stmt1;

mysql-test/r/fulltext.result

+4 −0
Original line number Diff line number Diff line
@@ -429,4 +429,8 @@ REPAIR TABLE t1; 
Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

SET myisam_repair_threads=@@global.myisam_repair_threads;

INSERT INTO t1 VALUES('testword\'\'');

SELECT a FROM t1 WHERE MATCH a AGAINST('testword' IN BOOLEAN MODE);

a

testword''

DROP TABLE t1;