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

.bzrignore

+9 −9

Original line number	Diff line number	Diff line
		@@ -284,6 +284,7 @@ libmysqld/password.c
		libmysqld/procedure.cc
		libmysqld/records.cc
		libmysqld/repl_failsafe.cc
		libmysqld/set_var.cc
		libmysqld/simple-test
		libmysqld/slave.cc
		libmysqld/sql_acl.cc
		@@ -357,6 +358,8 @@ myisam/myisamlog
		myisam/myisampack
		myisam/test1.MYD
		myisam/test1.MYI
		myisam/test2.MYD
		myisam/test2.MYI
		mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
		mysql-4.0.2-alpha.tar.gz
		mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
		@@ -424,6 +427,12 @@ sql-bench/copy-db
		sql-bench/crash-me
		sql-bench/gif/*
		sql-bench/graph-compare-results
		sql-bench/innotest1
		sql-bench/innotest1a
		sql-bench/innotest1b
		sql-bench/innotest2
		sql-bench/innotest2a
		sql-bench/innotest2b
		sql-bench/output/*
		sql-bench/run-all-tests
		sql-bench/server-cfg
		@@ -485,12 +494,3 @@ vio/test-ssl
		vio/test-sslclient
		vio/test-sslserver
		vio/viotest-ssl
		sql-bench/innotest1
		sql-bench/innotest1a
		sql-bench/innotest1b
		sql-bench/innotest2
		sql-bench/innotest2a
		sql-bench/innotest2b
		myisam/test2.MYD
		myisam/test2.MYI
		libmysqld/set_var.cc

Docs/manual.texi

+16 −2

Original line number	Diff line number	Diff line
		@@ -14373,6 +14373,10 @@ If this is enabled, a user can't create new users with the GRANT
		command, if the user doesn't have @code{INSERT} privilege to the
		@code{mysql.user} table or any column in this table.

		@item --skip-bdb
		Disable usage of BDB tables. This will save memory and may speed up some
		things.

		@item --skip-concurrent-insert
		Turn off the ability to select and insert at the same time on @code{MyISAM}
		tables. (This is only to be used if you think you have found a bug in this
		@@ -14392,6 +14396,10 @@ flush-privileges} or @code{mysqladmin reload}.)
		Never use host name cache for faster name-ip resolution, but query DNS server
		on every connect instead. @xref{DNS}.

		@item --skip-innodb
		Disable usage of Innodb tables. This will save memory and disk space and
		speed up some things.

		@item --skip-external-locking (was --skip-locking)
		Don't use system locking. To use @code{isamchk} or @code{myisamchk} you must
		shut down the server. @xref{Stability}. Note that in MySQL Version
		@@ -38620,6 +38628,9 @@ an auto-extending 10 MB file @file{ibdata1} to the @code{datadir}
		of MySQL. (In MySQL-4.0.0 and 4.0.1 the datafile is 64 MB and not
		auto-extending.)

		If you don't want to use @code{InnoDB} tables, you can add the
		@code{skip-innodb} option to your MySQL option file.

		But to get good performance you MUST explicitly set the InnoDB parameters
		listed in the following examples.

		@@ -40571,13 +40582,14 @@ BDB tables:
		@item @code{--bdb-no-recover} @tab Don't start Berkeley DB in recover mode.
		@item @code{--bdb-shared-data} @tab Start Berkeley DB in multi-process mode (Don't use @code{DB_PRIVATE} when initialising Berkeley DB)
		@item @code{--bdb-tmpdir=directory} @tab Berkeley DB tempfile name.
		@item @code{--skip-bdb} @tab Don't use berkeley db.
		@item @code{--skip-bdb} @tab Disable usage of BDB tables.
		@item @code{-O bdb_max_lock=1000} @tab Set the maximum number of locks possible. @xref{SHOW VARIABLES}.
		@end multitable

		If you use @code{--skip-bdb}, MySQL will not initialise the
		Berkeley DB library and this will save a lot of memory. Of course,
		you cannot use @code{BDB} tables if you are using this option.
		you cannot use @code{BDB} tables if you are using this option. If you try
		to create an BDB table, MySQL will instead create a MyISAM table.

		Normally you should start @code{mysqld} without @code{--bdb-no-recover} if you
		intend to use BDB tables. This may, however, give you problems when you
		@@ -50368,6 +50380,8 @@ Fixed some problems with @code{CREATE TABLE ... SELECT function()}.
		@code{mysqld} now has the option @code{--temp-pool} enabled by default as this
		gives better performance with some operating systems.
		@item
		Fixed hang in @code{CHANGE MASTER TO} if the slave thread died very quickly.
		@item
		Big cleanup in replication code (less logging, better error messages, etc..)
		@item
		If the @code{--code-file} option is specified, the server calls

client/mysql.cc

+7 −1

Original line number	Diff line number	Diff line
		@@ -112,6 +112,7 @@ typedef struct st_status


		static HashTable ht;
		static char **defaults_argv;

		enum enum_info_type { INFO_INFO,INFO_ERROR,INFO_RESULT};
		typedef enum enum_info_type INFO_TYPE;
		@@ -317,15 +318,19 @@ int main(int argc,char *argv[])
		status.add_to_history=1;
		status.exit_status=1;
		load_defaults("my",load_default_groups,&argc,&argv);
		defaults_argv=argv;
		if (get_options(argc, (char **) argv))
		{
		free_defaults(defaults_argv);
		my_end(0);
		exit(1);
		}
		free_defaults(argv);
		if (status.batch && !status.line_buff &&
		!(status.line_buff=batch_readline_init(max_allowed_packet+512,stdin)))
		{
		free_defaults(defaults_argv);
		exit(1);
		}
		glob_buffer.realloc(512);
		mysql_server_init(0, NULL, (char**) server_default_groups);
		completion_hash_init(&ht, 128);
		@@ -420,6 +425,7 @@ sig_handler mysql_end(int sig)
		my_free(default_prompt,MYF(MY_ALLOW_ZERO_PTR));
		my_free(current_prompt,MYF(MY_ALLOW_ZERO_PTR));
		mysql_server_end();
		free_defaults(defaults_argv);
		my_end(info_flag ? MY_CHECK_ERROR \| MY_GIVE_INFO : 0);
		exit(status.exit_status);
		}

client/mysqladmin.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -254,7 +254,10 @@ int main(int argc,char *argv[])
		load_defaults("my",load_default_groups,&argc,&argv);
		save_argv = argv; /* Save for free_defaults */
		if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
		{
		free_defaults(save_argv);
		exit(ho_error);
		}

		if (argc == 0)
		{

client/mysqlimport.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -471,9 +471,15 @@ int main(int argc, char **argv)
		/* argv is changed in the program */
		argv_to_free= argv;
		if (get_options(&argc, &argv))
		{
		free_defaults(argv_to_free);
		return(1);
		}
		if (!(sock= db_connect(current_host,current_db,current_user,opt_password)))
		{
		free_defaults(argv_to_free);
		return(1); /* purecov: deadcode */
		}
		if (lock_tables)
		lock_table(sock, argc, argv);
		for (; *argv != NULL; argv++)