Merge mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1 (c7447a25) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+8 −8

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@
		./mysql.sln
		./mysql.suo
		./prepare
		.DS_Store
		.defs.mk
		.depend
		.depend.mk
		@@ -1178,6 +1179,7 @@ libmysqld/sql_parse.cc
		libmysqld/sql_partition.cc
		libmysqld/sql_plugin.cc
		libmysqld/sql_prepare.cc
		libmysqld/sql_profile.cc
		libmysqld/sql_rename.cc
		libmysqld/sql_repl.cc
		libmysqld/sql_select.cc
		@@ -1279,6 +1281,9 @@ mysql-5.0.2-alpha.tar.gz
		mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
		mysql-test/*.ds?
		mysql-test/*.vcproj
		mysql-test/.DS_Store
		mysql-test/funcs_1.log
		mysql-test/funcs_1.tar
		mysql-test/gmon.out
		mysql-test/install_test_db
		mysql-test/lib/init_db.sql
		@@ -1367,9 +1372,12 @@ mysql-test/r/symlink.log
		mysql-test/r/system_mysql_db.log
		mysql-test/r/tmp.result
		mysql-test/r/udf.log
		mysql-test/reg.log
		mysql-test/rpl.log
		mysql-test/share/mysql
		mysql-test/std_data/*.pem
		mysql-test/suite/funcs_1.tar.gz
		mysql-test/suite/funcs_1.tar.zip
		mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings
		mysql-test/suite/funcs_1/r/innodb_views.warnings
		mysql-test/suite/funcs_1/r/memory_trig_03e.warnings
		@@ -3012,11 +3020,3 @@ win/vs8cache.txt
		ylwrap
		zlib/*.ds?
		zlib/*.vcproj
		mysql-test/funcs_1.log
		mysql-test/funcs_1.tar
		mysql-test/suite/funcs_1.tar.gz
		mysql-test/.DS_Store
		.DS_Store
		libmysqld/sql_profile.cc
		mysql-test/suite/funcs_1.tar.zip
		mysql-test/reg.log

client/mysqltest.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -7372,7 +7372,7 @@ void timer_output(void)

		ulonglong timer_now(void)
		{
		return my_getsystime() / 10000;
		return my_micro_time() / 1000;
		}

extra/perror.c

+31 −49

Original line number	Diff line number	Diff line
		@@ -13,9 +13,9 @@
		along with this program; if not, write to the Free Software
		Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */

		/* Return error-text for system error messages and nisam messages */
		/* Return error-text for system error messages and handler messages */

		#define PERROR_VERSION "2.10"
		#define PERROR_VERSION "2.11"

		#include <my_global.h>
		#include <my_sys.h>
		@@ -30,6 +30,10 @@

		static my_bool verbose, print_all_codes;

		#include "../include/my_base.h"
		#include "../mysys/my_handler_errors.h"
		#include "../include/my_handler.h"

		#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
		static my_bool ndb_code;
		static char ndb_string[1024];
		@@ -82,36 +86,6 @@ typedef struct ha_errors {

		static HA_ERRORS ha_errlist[]=
		{
		{ 120,"Didn't find key on read or update" },
		{ 121,"Duplicate key on write or update" },
		{ 123,"Someone has changed the row since it was read (while the table was locked to prevent it)" },
		{ 124,"Wrong index given to function" },
		{ 126,"Index file is crashed" },
		{ 127,"Record-file is crashed" },
		{ 128,"Out of memory" },
		{ 130,"Incorrect file format" },
		{ 131,"Command not supported by database" },
		{ 132,"Old database file" },
		{ 133,"No record read before update" },
		{ 134,"Record was already deleted (or record file crashed)" },
		{ 135,"No more room in record file" },
		{ 136,"No more room in index file" },
		{ 137,"No more records (read after end of file)" },
		{ 138,"Unsupported extension used for table" },
		{ 139,"Too big row"},
		{ 140,"Wrong create options"},
		{ 141,"Duplicate unique key or constraint on write or update"},
		{ 142,"Unknown character set used"},
		{ 143,"Conflicting table definitions in sub-tables of MERGE table"},
		{ 144,"Table is crashed and last repair failed"},
		{ 145,"Table was marked as crashed and should be repaired"},
		{ 146,"Lock timed out; Retry transaction"},
		{ 147,"Lock table is full; Restart program with a larger locktable"},
		{ 148,"Updates are not allowed under a read only transactions"},
		{ 149,"Lock deadlock; Retry transaction"},
		{ 150,"Foreign key constraint is incorrectly formed"},
		{ 151,"Cannot add a child row"},
		{ 152,"Cannot delete a parent row"},
		{ -30999, "DB_INCOMPLETE: Sync didn't finish"},
		{ -30998, "DB_KEYEMPTY: Key/data deleted or never created"},
		{ -30997, "DB_KEYEXIST: The key/data pair already exists"},
		@@ -193,6 +167,17 @@ static const char *get_ha_error_msg(int code)
		{
		HA_ERRORS *ha_err_ptr;

		/*
		If you got compilation error here about compile_time_assert array, check
		that every HA_ERR_xxx constant has a corresponding error message in
		handler_error_messages[] list (check mysys/ma_handler_errors.h and
		include/my_base.h).
		*/
		compile_time_assert(HA_ERR_FIRST + array_elements(handler_error_messages) ==
		HA_ERR_LAST + 1);
		if (code >= HA_ERR_FIRST && code <= HA_ERR_LAST)
		return handler_error_messages[code - HA_ERR_FIRST];

		for (ha_err_ptr=ha_errlist ; ha_err_ptr->errcode ;ha_err_ptr++)
		if (ha_err_ptr->errcode == code)
		return ha_err_ptr->msg;
		@@ -210,6 +195,8 @@ int main(int argc,char *argv[])
		if (get_options(&argc,&argv))
		exit(1);

		my_handler_error_register();

		error=0;
		#ifdef HAVE_SYS_ERRLIST
		if (print_all_codes)
		@@ -296,16 +283,7 @@ int main(int argc,char *argv[])
		else
		puts(msg);
		}

		if (!found)
		{
		/* Error message still not found, look in handler error codes */
		if (!(msg=get_ha_error_msg(code)))
		{
		fprintf(stderr,"Illegal error code: %d\n",code);
		error=1;
		}
		else
		if ((msg= get_ha_error_msg(code)))
		{
		found= 1;
		if (verbose)
		@@ -313,6 +291,10 @@ int main(int argc,char *argv[])
		else
		puts(msg);
		}
		if (!found)
		{
		fprintf(stderr,"Illegal error code: %d\n", code);
		error= 1;
		}
		}
		}

include/Makefile.am

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
		my_getopt.h sslopt-longopts.h my_dir.h \
		sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
		m_ctype.h my_attribute.h $(HEADERS_GEN)
		noinst_HEADERS = config-win.h config-netware.h \
		noinst_HEADERS = config-win.h config-netware.h my_bit.h \
		heap.h my_bitmap.h my_uctype.h \
		myisam.h myisampack.h myisammrg.h ft_global.h\
		mysys_err.h my_base.h help_start.h help_end.h \

include/config-win.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -255,9 +255,11 @@ inline double ulonglong2double(ulonglong value)
		#define tell(A) _telli64(A)
		#endif


		#define STACK_DIRECTION -1

		/* Difference between GetSystemTimeAsFileTime() and now() */
		#define OFFSET_TO_EPOCH ULL(116444736000000000)

		#define HAVE_PERROR
		#define HAVE_VFPRINT
		#define HAVE_RENAME /* Have rename() as function */