Commit df1dc775 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
parents 3a7f82ef 65cd36fc

BitKeeper/etc/logging_ok

+3 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ mronstrom@build.mysql.com 
mronstrom@mysql.com

mskold@mysql.com

msvensson@build.mysql.com

msvensson@neptunus.homeip.net

mwagner@cash.mwagner.org

mwagner@evoq.mwagner.org

mwagner@here.mwagner.org
@@ -161,6 +162,7 @@ mwagner@work.mysql.com 
mydev@mysql.com

mysql@home.(none)

mysql@mc04.(none)

mysqldev@bk-internal.mysql.com

mysqldev@build.mysql2.com

mysqldev@melody.local

mysqldev@mysql.com
@@ -197,6 +199,7 @@ ram@gw.mysql.r18.ru 
ram@gw.udmsearch.izhnet.ru

ram@mysql.r18.ru

ram@ram.(none)

ramil@mysql.com

ranger@regul.home.lan

rburnett@build.mysql.com

reggie@bob.(none)

include/mysql.h

+11 −0
Original line number Diff line number Diff line
@@ -337,6 +337,17 @@ typedef struct st_mysql_parameters 
*/

int STDCALL mysql_server_init(int argc, char **argv, char **groups);

void STDCALL mysql_server_end(void);

/*

  mysql_server_init/end need to be called when using libmysqld or

  libmysqlclient (exactly, mysql_server_init() is called by mysql_init() so

  you don't need to call it explicitely; but you need to call

  mysql_server_end() to free memory). The names are a bit misleading

  (mysql_SERVER* to be used when using libmysqlCLIENT). So we add more general

  names which suit well whether you're using libmysqld or libmysqlclient. We

  intend to promote these aliases over the mysql_server* ones.

*/

#define mysql_library_init mysql_server_init

#define mysql_library_end mysql_server_end



MYSQL_PARAMETERS *STDCALL mysql_get_parameters(void);

innobase/page/page0cur.c

+0 −6
Original line number Diff line number Diff line
@@ -311,9 +311,6 @@ page_cur_search_with_match( 
			low_matched_bytes = cur_matched_bytes;



		} else if (cmp == -1) {

			offsets = rec_get_offsets(mid_rec, index, offsets,

					dtuple_get_n_fields_cmp(tuple), &heap);



			if (mode == PAGE_CUR_LE_OR_EXTENDS

			    && page_cur_rec_field_extends(tuple, mid_rec,

						offsets, cur_matched_fields)) {
@@ -366,9 +363,6 @@ page_cur_search_with_match( 
			low_matched_bytes = cur_matched_bytes;



		} else if (cmp == -1) {

			offsets = rec_get_offsets(mid_rec, index, offsets,

					dtuple_get_n_fields_cmp(tuple), &heap);



			if (mode == PAGE_CUR_LE_OR_EXTENDS

			    && page_cur_rec_field_extends(tuple, mid_rec,

						offsets, cur_matched_fields)) {

mysql-test/include/have_multi_ndb.inc

0 → 100644
+28 −0
Original line number Diff line number Diff line 
# Setup connections to both MySQL Servers connected to the cluster

connect (server1,127.0.0.1,root,,test,$MASTER_MYPORT,);

connect (server2,127.0.0.1,root,,test,$MASTER_MYPORT1,);



# Check that server1 has NDB  support

connection server1;

disable_query_log;

--disable_warnings

drop table if exists t1, t2;

--enable_warnings

flush tables;

@r/have_ndb.require show variables like "have_ndbcluster";

@r/server_id.require show variables like "server_id";

enable_query_log;



# Check that server2 has NDB support

connection server2;

disable_query_log;

--disable_warnings

drop table if exists t1, t2;

--enable_warnings

flush tables;

@r/have_ndb.require show variables like "have_ndbcluster";

@r/server_id1.require show variables like "server_id";

enable_query_log;



# Set the default connection to 'server1'

connection server1;

mysql-test/include/have_ndb.inc

+1 −3
Original line number Diff line number Diff line
@@ -2,6 +2,4 @@ 
disable_query_log;

show variables like "have_ndbcluster";

enable_query_log;

#connect (server1,127.0.0.1,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);

#connect (server2,127.0.0.1,root,,test,$MASTER_MYPORT1,$MASTER_MYSOCK1);

#connection server1;