Merge bk-internal.mysql.com:/home/bk/mysql-4.1 (9ec764c4) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/lowercase_table2.result

+2 −1

Original line number	Diff line number	Diff line
		DROP TABLE IF EXISTS t1,t2,t3;
		DROP TABLE IF EXISTS t1,t2,t3,t2aA,t1Aa;
		DROP DATABASE IF EXISTS `TEST_$1`;
		DROP DATABASE IF EXISTS `test_$1`;
		DROP DATABASE mysqltest_LC2;
		CREATE TABLE T1 (a int);
		INSERT INTO T1 VALUES (1);
		SHOW TABLES LIKE "T1";

mysql-test/t/lowercase_table2.test

+2 −1

Original line number	Diff line number	Diff line
		@@ -10,9 +10,10 @@ show variables like "lower_case_table_names";
		enable_query_log;

		--disable_warnings
		DROP TABLE IF EXISTS t1,t2,t3;
		DROP TABLE IF EXISTS t1,t2,t3,t2aA,t1Aa;
		DROP DATABASE IF EXISTS `TEST_$1`;
		DROP DATABASE IF EXISTS `test_$1`;
		DROP DATABASE mysqltest_LC2;
		--enable_warnings

		CREATE TABLE T1 (a int);

mysys/my_fopen.c

+49 −35

Original line number	Diff line number	Diff line
		@@ -21,25 +21,34 @@

		static void make_ftype(my_string to,int flag);

		/* Open a file as stream */
		/*
		Open a file as stream

		SYNOPSIS
		my_fopen()
		FileName Path-name of file
		Flags Read \| write \| append \| trunc (like for open())
		MyFlags Flags for handling errors

		RETURN
		0 Error
		# File handler
		*/

		FILE my_fopen(const char FileName, int Flags, myf MyFlags)
		/* Path-name of file */
		/* Read \| write .. */
		/* Special flags */
		FILE my_fopen(const char filename, int flags, myf MyFlags)
		{
		FILE *fd;
		char type[5];
		DBUG_ENTER("my_fopen");
		DBUG_PRINT("my",("Name: '%s' Flags: %d MyFlags: %d",
		FileName, Flags, MyFlags));
		DBUG_PRINT("my",("Name: '%s' flags: %d MyFlags: %d",
		filename, flags, MyFlags));
		/*
		if we are not creating, then we need to use my_access to make sure
		the file exists since Windows doesn't handle files like "com1.sym"
		very well
		*/
		#ifdef __WIN__
		if (check_if_legal_filename(FileName))
		if (check_if_legal_filename(filename))
		{
		errno= EACCES;
		fd= 0;
		@@ -47,8 +56,8 @@ FILE my_fopen(const char FileName, int Flags, myf MyFlags)
		else
		#endif
		{
		make_ftype(type,Flags);
		fd = fopen(FileName, type);
		make_ftype(type,flags);
		fd = fopen(filename, type);
		}

		if (fd != 0)
		@@ -65,7 +74,7 @@ FILE my_fopen(const char FileName, int Flags, myf MyFlags)
		}
		pthread_mutex_lock(&THR_LOCK_open);
		if ((my_file_info[fileno(fd)].name = (char*)
		my_strdup(FileName,MyFlags)))
		my_strdup(filename,MyFlags)))
		{
		my_stream_opened++;
		my_file_info[fileno(fd)].type = STREAM_BY_FOPEN;
		@@ -81,9 +90,9 @@ FILE my_fopen(const char FileName, int Flags, myf MyFlags)
		my_errno=errno;
		DBUG_PRINT("error",("Got error %d on open",my_errno));
		if (MyFlags & (MY_FFNF \| MY_FAE \| MY_WME))
		my_error((Flags & O_RDONLY) \|\| (Flags == O_RDONLY ) ? EE_FILENOTFOUND :
		my_error((flags & O_RDONLY) \|\| (flags == O_RDONLY ) ? EE_FILENOTFOUND :
		EE_CANTCREATEFILE,
		MYF(ME_BELL+ME_WAITTANG), FileName,my_errno);
		MYF(ME_BELL+ME_WAITTANG), filename, my_errno);
		DBUG_RETURN((FILE*) 0);
		} /* my_fopen */

		@@ -158,14 +167,24 @@ FILE my_fdopen(File Filedes, const char name, int Flags, myf MyFlags)
		DBUG_RETURN(fd);
		} /* my_fdopen */


		/*
		make_ftype
		Make a filehandler-open-typestring from ordinary inputflags
		Make a fopen() typestring from a open() type bitmap

		Note: This routine attempts to find the best possible match
		SYNOPSIS
		make_ftype()
		to String for fopen() is stored here
		flag Flag used by open()

		IMPLEMENTATION
		This routine attempts to find the best possible match
		between a numeric option and a string option that could be
		fed to fopen. There is not a 1 to 1 mapping between the two.

		NOTE
		On Unix, O_RDONLY is usually 0

		MAPPING
		r == O_RDONLY
		w == O_WRONLY\|O_TRUNC\|O_CREAT
		a == O_WRONLY\|O_APPEND\|O_CREAT
		@@ -173,18 +192,14 @@ FILE my_fdopen(File Filedes, const char name, int Flags, myf MyFlags)
		w+ == O_RDWR\|O_TRUNC\|O_CREAT
		a+ == O_RDWR\|O_APPEND\|O_CREAT
		*/

		static void make_ftype(register my_string to, register int flag)
		{
		#if FILE_BINARY
		/* If we have binary-files */
		reg3 int org_flag=flag;
		#endif
		flag&= ~FILE_BINARY; /* remove binary bit */

		/* check some possible invalid combinations */
		DBUG_ASSERT(flag & (O_TRUNC\|O_APPEND) != O_TRUNC\|O_APPEND);
		DBUG_ASSERT((flag & (O_TRUNC \| O_APPEND)) != (O_TRUNC \| O_APPEND));
		DBUG_ASSERT((flag & (O_WRONLY \| O_RDWR)) != (O_WRONLY \| O_RDWR));

		if (flag & (O_RDONLY\|O_WRONLY) == O_WRONLY)
		if ((flag & (O_RDONLY\|O_WRONLY)) == O_WRONLY)
		*to++= (flag & O_APPEND) ? 'a' : 'w';
		else if (flag & O_RDWR)
		{
		@@ -201,9 +216,8 @@ static void make_ftype(register my_string to, register int flag)
		*to++= 'r';

		#if FILE_BINARY /* If we have binary-files */
		if (org_flag & FILE_BINARY)
		if (flag & FILE_BINARY)
		*to++='b';
		#endif
		*to='\0';
		} /* make_ftype */

sql/field.cc

+8 −1

Original line number	Diff line number	Diff line
		@@ -1053,6 +1053,7 @@ void Field_str::make_field(Send_field *field)

		uint Field::fill_cache_field(CACHE_FIELD *copy)
		{
		uint store_length;
		copy->str=ptr;
		copy->length=pack_length();
		copy->blob_field=0;
		@@ -1065,10 +1066,16 @@ uint Field::fill_cache_field(CACHE_FIELD *copy)
		}
		else if (!zero_pack() && (type() == FIELD_TYPE_STRING && copy->length > 4 \|\|
		type() == FIELD_TYPE_VAR_STRING))
		{
		copy->strip=1; /* Remove end space */
		store_length= 2;
		}
		else
		{
		copy->strip=0;
		return copy->length+(int) copy->strip;
		store_length= 0;
		}
		return copy->length+ store_length;
		}

sql/mysqld.cc

+0 −3

Original line number	Diff line number	Diff line
		@@ -6098,9 +6098,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
		case (int) OPT_SLOW_QUERY_LOG:
		opt_slow_log=1;
		break;
		case (int) OPT_LOG_SLOW_ADMIN_STATEMENTS:
		opt_log_slow_admin_statements= 1;
		break;
		case (int) OPT_SKIP_NEW:
		opt_specialflag\|= SPECIAL_NO_NEW_FUNC;
		delay_key_write_options= (uint) DELAY_KEY_WRITE_NONE;