Merge work.mysql.com:/home/bk/mysql (e595fe3b) · Commits · Software / OSDI20 Artifacts / mariadb

BitKeeper/etc/logging_ok

+2 −1

+3 −1

Original line number	Diff line number	Diff line
		@@ -44926,7 +44926,9 @@ table for a different site you are working on, but the table is just a
		bit different (that is - fields in different order, etc.).
		By Steve Shreeve.
		@item @uref{http://www.mysql.com/Downloads/Contrib/oracledump, oracledump}
		Perl program to convert Oracle databases to @strong{MySQL}. By Johan Andersson.
		Perl program to convert Oracle databases to @strong{MySQL}. Has same
		output format as mysqldump. By Johan Andersson.

		@item @uref{http://www.mysql.com/Downloads/Contrib/excel2mysql, excel2mysql}
		Perl program to import Excel spreadsheets into a @strong{MySQL} database. By Stephen Hurd @email{shurd@@sk.sympatico.ca}

+2 −0

Original line number	Diff line number	Diff line
		@@ -389,6 +389,8 @@ extern int my_realpath(char to, const char filename, myf MyFlags);
		extern File my_create_with_symlink(const char linkname, const char filename,
		int createflags, int access_flags,
		myf MyFlags);
		extern int my_delete_with_symlink(const char *name, myf MyFlags);
		extern int my_rename_with_symlink(const char from,const char to,myf MyFlags);
		extern int my_symlink(const char content, const char linkname, myf MyFlags);
		extern uint my_read(File Filedes,byte *Buffer,uint Count,myf MyFlags);
		extern uint my_pread(File Filedes,byte *Buffer,uint Count,my_off_t offset,

+20 −4

Original line number	Diff line number	Diff line
		@@ -94,10 +94,12 @@ mutex_test_and_set(

		/* In assembly we use the so-called AT & T syntax where
		the order of operands is inverted compared to the ordinary Intel
		syntax. The 'l' after the mnemonics denotes a 32-bit operation. */
		syntax. The 'l' after the mnemonics denotes a 32-bit operation.
		The line after the code tells which values come out of the asm
		code, and the second line tells the input to the asm code. */

		asm volatile("movl $1, %%eax; xchgl (%%ecx), %%eax" :
		"=eax" (res):
		"=eax" (res), "=m" (*lw) :
		"ecx" (lw));
		return(res);
		#else
		@@ -132,12 +134,26 @@ mutex_reset_lock_word(
		__asm MOV EDX, 0
		__asm MOV ECX, lw
		__asm XCHG EDX, DWORD PTR [ECX]
		#elif defined(__GNUC__) && defined(UNIV_INTEL_X86)
		ulint* lw;

		lw = &(mutex->lock_word);

		/* In assembly we use the so-called AT & T syntax where
		the order of operands is inverted compared to the ordinary Intel
		syntax. The 'l' after the mnemonics denotes a 32-bit operation. */

		asm volatile("movl $0, %%eax; xchgl (%%ecx), %%eax" :
		"=m" (*lw) :
		"ecx" (lw) :
		"eax"); /* gcc does not seem to understand
		that our asm code resets eax: tell it
		explicitly that after the third ':' */
		#else
		mutex->lock_word = 0;
		#if !(defined(__GNUC__) && defined(UNIV_INTEL_X86))

		os_fast_mutex_unlock(&(mutex->os_fast_mutex));
		#endif
		#endif
		}

		/**********************************************************************

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \
		mf_pack.lo my_messnc.lo mf_dirname.lo mf_fn_ext.lo\
		mf_wcomp.lo typelib.lo safemalloc.lo my_alloc.lo \
		mf_format.lo mf_path.lo mf_unixpath.lo my_fopen.lo \
		my_fstream.lo \
		my_symlink.lo my_fstream.lo \
		mf_loadpath.lo my_pthread.lo my_thr_init.lo \
		thr_mutex.lo mulalloc.lo string.lo default.lo \
		my_compress.lo array.lo my_once.lo list.lo my_net.lo \