Commit 37b79d90 authored by unknown's avatar unknown
Browse files

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 

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


client/mysql.cc:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Auto merged
mysql-test/r/information_schema.result:
  manual merge
mysql-test/t/information_schema.test:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
  manual merge
storage/ndb/src/ndbapi/DictCache.cpp:
  manual merge
parents 17c95456 326ebe4c

client/mysql.cc

+9 −1
Original line number Diff line number Diff line
@@ -448,6 +448,14 @@ int main(int argc,char *argv[]) 
				 MYF(MY_WME));

      if (histfile)

	sprintf(histfile,"%s/.mysql_history",getenv("HOME"));

      char link_name[FN_REFLEN];

      if (my_readlink(link_name, histfile, 0) == 0 &&

          strncmp(link_name, "/dev/null", 10) == 0)

      {

        /* The .mysql_history file is a symlink to /dev/null, don't use it */

        my_free(histfile, MYF(MY_ALLOW_ZERO_PTR));

        histfile= 0;

      }

    }

    if (histfile)

    {
@@ -484,7 +492,7 @@ sig_handler mysql_end(int sig) 
{

  mysql_close(&mysql);

#ifdef HAVE_READLINE

  if (!status.batch && !quick && !opt_html && !opt_xml)

  if (!status.batch && !quick && !opt_html && !opt_xml && histfile)

  {

    /* write-history */

    if (verbose)

include/sslopt-longopts.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
   0, 0, 0, 0, 0, 0},

#ifdef MYSQL_CLIENT

  {"ssl-verify-server-cert", OPT_SSL_VERIFY_SERVER_CERT,

   "Verify servers \"Common Name\" in it's cert against hostname used when connecting. This option is disabled by default.",

   "Verify server's \"Common Name\" in its cert against hostname used when connecting. This option is disabled by default.",

   (gptr*) &opt_ssl_verify_server_cert, (gptr*) &opt_ssl_verify_server_cert,

    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

mysql-test/r/func_str.result

+7 −0
Original line number Diff line number Diff line
@@ -1017,6 +1017,13 @@ t 
1000000

1      

drop table t1;

select load_file("lkjlkj");

load_file("lkjlkj")

NULL

select ifnull(load_file("lkjlkj"),"it's null");

ifnull(load_file("lkjlkj"),"it's null")

it's null

End of 4.1 tests

create table t1 (d decimal default null);

insert into t1 values (null);

select format(d, 2) from t1;

mysql-test/r/information_schema.result

+17 −0
Original line number Diff line number Diff line
@@ -1136,6 +1136,23 @@ table_schema='information_schema' and 
group by column_type order by num;

column_type	group_concat(table_schema, '.', table_name)	num

varchar(7)	information_schema.ROUTINES,information_schema.VIEWS	2

create table t1(f1 char(1) not null, f2 char(9) not null)

default character set utf8;

select CHARACTER_MAXIMUM_LENGTH, CHARACTER_OCTET_LENGTH from

information_schema.columns where table_schema='test' and table_name = 't1';

CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH

1	3

9	27

drop table t1;

use mysql;

INSERT INTO `proc` VALUES ('test','','PROCEDURE','','SQL','CONTAINS_SQL',

'NO','DEFINER','','','BEGIN\r\n  \r\nEND','root@%','2006-03-02 18:40:03',

'2006-03-02 18:40:03','','');

select routine_name from information_schema.routines;

routine_name



delete from proc where name='';

use test;

varchar(20)	information_schema.COLUMNS,information_schema.FILES,information_schema.FILES,information_schema.PLUGINS,information_schema.PLUGINS,information_schema.PLUGINS	6

select * from information_schema.engines WHERE ENGINE="MyISAM";

ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS

mysql-test/r/join.result

+2 −2
Original line number Diff line number Diff line
@@ -700,8 +700,8 @@ ERROR 42S22: Unknown column 't1.b' in 'on clause' 
select * from information_schema.statistics join information_schema.columns

using(table_name,column_name) where table_name='user';

TABLE_NAME	COLUMN_NAME	TABLE_CATALOG	TABLE_SCHEMA	NON_UNIQUE	INDEX_SCHEMA	INDEX_NAME	SEQ_IN_INDEX	COLLATION	CARDINALITY	SUB_PART	PACKED	NULLABLE	INDEX_TYPE	COMMENT	TABLE_CATALOG	TABLE_SCHEMA	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT

user	Host	NULL	mysql	0	mysql	PRIMARY	1	A	NULL	NULL	NULL		BTREE		NULL	mysql	1		NO	char	20	60	NULL	NULL	utf8	utf8_bin	char(60)	PRI		select,insert,update,references	

user	User	NULL	mysql	0	mysql	PRIMARY	2	A	5	NULL	NULL		BTREE		NULL	mysql	2		NO	char	5	16	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	

user	Host	NULL	mysql	0	mysql	PRIMARY	1	A	NULL	NULL	NULL		BTREE		NULL	mysql	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		select,insert,update,references	

user	User	NULL	mysql	0	mysql	PRIMARY	2	A	5	NULL	NULL		BTREE		NULL	mysql	2		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	

drop table t1;

drop table t2;

drop table t3;