Commit 1a2c5c06 authored by unknown's avatar unknown
Browse files

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 

into  mysql.com:/data2/mysql-5.1-new-ndb
parents a6c63a71 41e68be6

BitKeeper/etc/collapsed

+3 −0
Original line number Diff line number Diff line 
44d03f27qNdqJmARzBoP3Is_cN5e0w

44ec850ac2k4y2Omgr92GiWPBAVKGQ

44edb86b1iE5knJ97MbliK_3lCiAXA

44f33f3aj5KW5qweQeekY1LU0E9ZCg

include/mysql_com.h

+6 −0
Original line number Diff line number Diff line
@@ -213,7 +213,13 @@ typedef struct st_net { 
  char last_error[MYSQL_ERRMSG_SIZE], sqlstate[SQLSTATE_LENGTH+1];

  unsigned int last_errno;

  unsigned char error;



  /*

    'query_cache_query' should be accessed only via query cache

    functions and methods to maintain proper locking.

  */

  gptr query_cache_query;



  my_bool report_error; /* We should report error (we have unreported error) */

  my_bool return_errno;

} NET;

libmysql/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
                    ${CMAKE_SOURCE_DIR}/sql

                    ${CMAKE_SOURCE_DIR}/strings)



ADD_LIBRARY(libmysql MODULE dll.c libmysql.def

ADD_LIBRARY(libmysql SHARED dll.c libmysql.def

                     ../mysys/array.c ../strings/bchange.c ../strings/bmove.c 

                     ../strings/bmove_upp.c ../mysys/charset-def.c ../mysys/charset.c

                     ../sql-common/client.c ../strings/ctype-big5.c ../strings/ctype-bin.c

mysql-test/include/have_ndbapi_examples.inc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
--require r/have_ndbapi_examples.require

disable_query_log;

eval select LENGTH("$MY_NDB_EXAMPLES_BINARY") > 0 as "have_ndb_example";

enable_query_log;

mysql-test/include/im_check_env.inc

+2 −4
Original line number Diff line number Diff line
@@ -2,10 +2,6 @@ 
# that ensure that starting conditions (environment) for the IM-test are as

# expected.



# Wait for mysqld1 (guarded instance) to start.



--exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD1_PATH_PID 30 started



# Check the running instances.



--connect (mysql1_con,localhost,root,,mysql,$IM_MYSQLD1_PORT,$IM_MYSQLD1_SOCK)
@@ -14,6 +10,8 @@ 


SHOW VARIABLES LIKE 'server_id';



--source include/not_windows.inc



--connection default



# Let IM detect that mysqld1 is online. This delay should be longer than