Commit 06733a24 authored by unknown's avatar unknown
Browse files

Merge dev3-127.(none):/mnt/mysql/home/ngb/bug19873 

into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug19873


include/config-netware.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
storage/innobase/btr/btr0btr.c:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/fsp/fsp0fsp.c:
  Auto merged
storage/innobase/include/buf0buf.ic:
  Auto merged
storage/innobase/log/log0log.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/innobase/ut/ut0dbg.c:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
parents 52ac50b3 49d46e0c

include/config-netware.h

+4 −0
Original line number Diff line number Diff line
@@ -122,6 +122,10 @@ extern "C" { 
/* On NetWare, to fix the problem with the deletion of open files */

#define CANT_DELETE_OPEN_FILES 1



#define FN_LIBCHAR '\\'

#define FN_ROOTDIR "\\"

#define FN_DEVCHAR ':'



/* default directory information */

#define	DEFAULT_MYSQL_HOME    "sys:/mysql"

#define PACKAGE               "mysql"

mysql-test/r/openssl_1.result

+6 −3
Original line number Diff line number Diff line
@@ -3,9 +3,12 @@ create table t1(f1 int); 
insert into t1 values (5);

grant select on test.* to ssl_user1@localhost require SSL;

grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA";

grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/L=Uppsala/O=MySQL AB/CN=MySQL Client/emailAddress=abstract.mysql.developer@mysql.com";

grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/L=Uppsala/O=MySQL AB/CN=MySQL Client/emailAddress=abstract.mysql.developer@mysql.com" ISSUER "/C=SE/L=Uppsala/O=MySQL AB/CN=Abstract MySQL Developer/emailAddress=abstract.mysql.developer@mysql.com";

grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";

grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";

grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";

flush privileges;

connect(localhost,ssl_user5,,test,MASTER_PORT,MASTER_SOCKET);

ERROR 28000: Access denied for user 'ssl_user5'@'localhost' (using password: NO)

SHOW STATUS LIKE 'Ssl_cipher';

Variable_name	Value

Ssl_cipher	DHE-RSA-AES256-SHA
@@ -39,7 +42,7 @@ f1 
delete from t1;

ERROR 42000: DELETE command denied to user 'ssl_user4'@'localhost' for table 't1'

drop user ssl_user1@localhost, ssl_user2@localhost,

ssl_user3@localhost, ssl_user4@localhost;

ssl_user3@localhost, ssl_user4@localhost, ssl_user5@localhost;

drop table t1;

mysqltest: Could not open connection 'default': 2026 SSL connection error

mysqltest: Could not open connection 'default': 2026 SSL connection error

mysql-test/t/openssl_1.test

+7 −3
Original line number Diff line number Diff line
@@ -10,14 +10,18 @@ insert into t1 values (5); 


grant select on test.* to ssl_user1@localhost require SSL;

grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA";

grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/L=Uppsala/O=MySQL AB/CN=MySQL Client/emailAddress=abstract.mysql.developer@mysql.com";

grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/L=Uppsala/O=MySQL AB/CN=MySQL Client/emailAddress=abstract.mysql.developer@mysql.com" ISSUER "/C=SE/L=Uppsala/O=MySQL AB/CN=Abstract MySQL Developer/emailAddress=abstract.mysql.developer@mysql.com";

grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";

grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";

grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";

flush privileges;



connect (con1,localhost,ssl_user1,,,,,SSL);

connect (con2,localhost,ssl_user2,,,,,SSL);

connect (con3,localhost,ssl_user3,,,,,SSL);

connect (con4,localhost,ssl_user4,,,,,SSL);

--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT

--error 1045

connect (con5,localhost,ssl_user5,,,,,SSL);



connection con1;

# Check ssl turned on
@@ -49,7 +53,7 @@ delete from t1; 


connection default;

drop user ssl_user1@localhost, ssl_user2@localhost,

ssl_user3@localhost, ssl_user4@localhost;

ssl_user3@localhost, ssl_user4@localhost, ssl_user5@localhost;



drop table t1;

sql/ha_innodb.cc

+12 −19
Original line number Diff line number Diff line
@@ -2364,8 +2364,7 @@ ha_innobase::open( 
				"have forgotten\nto delete the corresponding "

				".frm files of InnoDB tables, or you\n"

				"have moved .frm files to another database?\n"

				"Look from section 15.1 of "

				"http://www.innodb.com/ibman.html\n"

				"See http://dev.mysql.com/doc/refman/5.0/en/innodb-troubleshooting.html\n"

				"how you can resolve the problem.\n",

				norm_name);

		free_share(share);
@@ -2382,8 +2381,7 @@ ha_innobase::open( 
				"Have you deleted the .ibd file from the "

				"database directory under\nthe MySQL datadir, "

				"or have you used DISCARD TABLESPACE?\n"

				"Look from section 15.1 of "

				"http://www.innodb.com/ibman.html\n"

				"See http://dev.mysql.com/doc/refman/5.0/en/innodb-troubleshooting.html\n"

				"how you can resolve the problem.\n",

				norm_name);

		free_share(share);
@@ -5604,13 +5602,14 @@ ha_innobase::info( 
		for (i = 0; i < table->s->keys; i++) {

			if (index == NULL) {

				ut_print_timestamp(stderr);

				sql_print_error("Table %s contains less "

				sql_print_error("Table %s contains fewer "

						"indexes inside InnoDB than "

						"are defined in the MySQL "

						".frm file. Have you mixed up "

						".frm files from different "

						"installations? See section "

						"15.1 at http://www.innodb.com/ibman.html",

						"installations? See "

"http://dev.mysql.com/doc/refman/5.0/en/innodb-troubleshooting.html\n",



						ib_table->name);

				break;

			}
@@ -5619,17 +5618,11 @@ ha_innobase::info( 


				if (j + 1 > index->n_uniq) {

					ut_print_timestamp(stderr);

					sql_print_error("Index %s of %s has "

							"%lu columns unique "

							"inside InnoDB, but "

							"MySQL is asking "

							"statistics for %lu "

							"columns. Have you "

							"mixed up .frm files "

							"from different "

							"installations? See "

							"section 15.1 at "

							"http://www.innodb.com/ibman.html",

					sql_print_error(

"Index %s of %s has %lu columns unique inside InnoDB, but MySQL is asking "

"statistics for %lu columns. Have you mixed up .frm files from different "

"installations? "

"See http://dev.mysql.com/doc/refman/5.0/en/innodb-troubleshooting.html\n",

							index->name,

							ib_table->name,

							(unsigned long)
@@ -6438,7 +6431,7 @@ ha_innobase::transactional_table_lock( 
"table %s does not exist.\n"

"Have you deleted the .ibd file from the database directory under\n"

"the MySQL datadir?"

"Look from section 15.1 of http://www.innodb.com/ibman.html\n"

"See http://dev.mysql.com/doc/refman/5.0/en/innodb-troubleshooting.html\n"

"how you can resolve the problem.\n",

				prebuilt->table->name);

		DBUG_RETURN(HA_ERR_CRASHED);

sql/item_timefunc.cc

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static bool extract_date_time(DATE_TIME_FORMAT *format, 
	tmp= (char*) val + min(2, val_len);

	l_time->day= (int) my_strtoll10(val, &tmp, &error);

	/* Skip 'st, 'nd, 'th .. */

	val= tmp + min((int) (end-tmp), 2);

	val= tmp + min((int) (val_end-tmp), 2);

	break;



	/* Hour */