Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 (8a5ef8dc) · Commits · Software / OSDI20 Artifacts / mariadb

client/mysql.cc

+1 −0

Original line number	Diff line number	Diff line
		@@ -701,6 +701,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
		opt_mysql_unix_port= my_strdup(MYSQL_NAMEDPIPE, MYF(0));
		#endif
		break;
		#include <sslopt-case.h>
		case 'V':
		usage(1);
		exit(0);

configure.in

+19 −2

Original line number	Diff line number	Diff line
		@@ -453,6 +453,7 @@ fi

		NOINST_LDFLAGS=

		static_nss=""
		AC_ARG_WITH(other-libc,
		[ --with-other-libc=DIR Link against libc and other standard libraries
		installed in the specified non-standard location
		@@ -472,7 +473,6 @@ AC_ARG_WITH(other-libc,
		# by telling it to be permissive. Note that this option only works with
		# new versions of gcc (2.95.x and above)
		CXXFLAGS="$CXXFLAGS -fpermissive -I$other_libc_include"
		static_nss=
		if test -f "$other_libc_lib/libnss_files.a"
		then
		# libc has been compiled with --enable-static-nss
		@@ -507,6 +507,23 @@ AC_ARG_WITH(other-libc,
		)
		AC_SUBST(NOINST_LDFLAGS)

		#
		# Check if we are using Linux and a glibc compiled with static nss
		# (this is true on the MySQL build machines to avoid NSS problems)
		#

		if test "$IS_LINUX" = "true" -a "$static_nss" = ""
		then
		tmp=`nm /usr/lib/libc.a \| grep _nss_files_getaliasent_r`
		if test -n "$tmp"
		then
		STATIC_NSS_FLAGS="-Wl,--start-group -lc -lnss_files -lnss_dns -lresolv \
		-Wl,--end-group"
		static_nss=1
		fi
		fi


		AC_ARG_WITH(server-suffix,
		[ --with-server-suffix Append value to the version string.],
		[ MYSQL_SERVER_SUFFIX=`echo "$withval" \| sed -e 's/^$...................................$..*$/\1/'` ],
		@@ -1392,7 +1409,7 @@ else
		CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"
		fi

		# Force static compilation to avoid linking probles/get more speed
		# Force static compilation to avoid linking problems/get more speed
		AC_ARG_WITH(mysqld-ldflags,
		[ --with-mysqld-ldflags Extra linking arguments for mysqld],
		[MYSQLD_EXTRA_LDFLAGS=$withval],

sql/lock.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -470,7 +470,7 @@ int lock_table_name(THD thd, TABLE_LIST table_list)
		DBUG_ENTER("lock_table_name");
		safe_mutex_assert_owner(&LOCK_open);

		key_length=(uint) (strmov(strmov(key,table_list->db)+1,table_list->name)
		key_length=(uint) (strmov(strmov(key,table_list->db)+1,table_list->real_name)
		-key)+ 1;

		/* Only insert the table if we haven't insert it already */
		@@ -499,7 +499,7 @@ int lock_table_name(THD thd, TABLE_LIST table_list)
		my_free((gptr) table,MYF(0));
		DBUG_RETURN(-1);
		}
		if (remove_table_from_cache(thd, table_list->db, table_list->name))
		if (remove_table_from_cache(thd, table_list->db, table_list->real_name))
		DBUG_RETURN(1); // Table is in use
		DBUG_RETURN(0);
		}

sql/log_event.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -1718,7 +1718,7 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli)
		TABLE_LIST tables;
		bzero((char*) &tables,sizeof(tables));
		tables.db = thd->db;
		tables.name = tables.real_name = (char*)table_name;
		tables.alias = tables.real_name = (char*)table_name;
		tables.lock_type = TL_WRITE;
		// the table will be opened in mysql_load
		if (table_rules_on && !tables_ok(thd, &tables))

sql/mysqld.cc

+1 −3

Original line number	Diff line number	Diff line
		@@ -1884,9 +1884,6 @@ int main(int argc, char **argv)
		charsets_list = list_charsets(MYF(MY_COMPILED_SETS\|MY_CONFIG_SETS));

		#ifdef HAVE_OPENSSL
		if (opt_ssl_key \|\| opt_ssl_cert \|\| opt_ssl_ca \|\| opt_ssl_capath \|\|
		opt_ssl_cipher)
		opt_use_ssl= 1;
		if (opt_use_ssl)
		{
		/* having ssl_acceptor_fd != 0 signals the use of SSL */
		@@ -3969,6 +3966,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
		net_buffer_length= atoi(argument);
		break;
		#endif
		#include <sslopt-case.h>
		case 'v':
		case 'V':
		print_version();