Commit 5fde853b authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1


BitKeeper/etc/config:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents e5ca7155 9ea8a511

VC++Files/tests/mysql_client_test.dsp

+2 −2
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ BSC32=bscmake.exe 
# ADD BASE BSC32 /nologo 

# ADD BSC32 /nologo 

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib mysqlclient.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\client_release\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib mysqlclient.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\client_release\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib mysqlclient.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\client_release\mysql_client_test.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib mysqlclient.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\client_release\mysql_client_test.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 



!ENDIF

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ typedef off_t os_off_t; 
#define socket_errno	WSAGetLastError()

#define SOCKET_EINTR	WSAEINTR

#define SOCKET_EAGAIN	WSAEINPROGRESS

#define SOCKET_EWOULDBLOCK WSAEINPROGRESS

#define SOCKET_EWOULDBLOCK WSAEWOULDBLOCK

#define SOCKET_ENFILE	ENFILE

#define SOCKET_EMFILE	EMFILE

#elif defined(OS2)

mysql-test/mysql-test-run.pl

+24 −0
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ sub executable_setup (); 
sub environment_setup ();

sub kill_running_server ();

sub kill_and_cleanup ();

sub ndbcluster_support ();

sub ndbcluster_install ();

sub ndbcluster_start ();

sub ndbcluster_stop ();
@@ -319,6 +320,12 @@ sub main () { 
  initial_setup();

  command_line_setup();

  executable_setup();

  

  if (! $opt_skip_ndbcluster and ! $opt_with_ndbcluster)

  {

    $opt_with_ndbcluster= ndbcluster_support();

  }



  environment_setup();

  signal_setup();
@@ -1026,6 +1033,23 @@ sub kill_and_cleanup () { 
#

##############################################################################



sub ndbcluster_support () {



  # check ndbcluster support by testing using a switch

  # that is only available in that case

  if ( mtr_run($exe_mysqld,

	       ["--no-defaults",

	        "--ndb-use-exact-count",

	        "--help"],

	       "", "/dev/null", "/dev/null", "") != 0 )

  {

    mtr_report("No ndbcluster support");

    return 0;

  }

  mtr_report("Has ndbcluster support");

  return 1;

}



# FIXME why is there a different start below?!



sub ndbcluster_install () {

mysql-test/r/func_des_encrypt.result

0 → 100644
+3 −0
Original line number Diff line number Diff line 
select des_encrypt('hello');

des_encrypt('hello')

€Ö2nV“Ø}

mysql-test/r/information_schema.result

+1 −1
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ Database Table In_use Name_locked 
mysql	user	0	0

show status where variable_name like "%database%";

Variable_name	Value

Com_show_databases	0

Com_show_databases	3

show variables where variable_name like "skip_show_databas";

Variable_name	Value

show global status like "Threads_running";