unknown 62fd471647 Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines ...

into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge


configure.in:
  Auto merged
mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/r/log_tables.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Auto merged
mysql-test/t/heap_btree.test:
  Auto merged
mysql-test/t/log_tables.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysys/my_getopt.c:
  Auto merged
scripts/mysql_system_tables.sql:
  Auto merged
sql/sql_base.cc:
  Auto merged

2007-10-19 13:06:37 -07:00

..

.cvsignore

…

array.c

Added casts to avoid compiler warnings and fixed a wrong type.

2007-05-31 17:45:22 +03:00

base64.c

Fixed compiler warnings

2007-02-23 13:13:55 +02:00

ChangeLog

Fix skipp -> skip once and for all.

2004-06-03 11:52:54 -05:00

charset-def.c

Merge maint1.mysql.com:/data/localhome/tsmith/bk/maint/50

2007-06-21 20:55:37 +02:00

charset.c

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1

2007-08-04 11:08:11 +02:00

checksum.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

CMakeLists.txt

CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:

2007-08-06 23:16:01 +02:00

default_modify.c

Slow query log to file now displays queries with microsecond precission

2007-07-30 11:33:50 +03:00

default.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

errors.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

hash.c

Slow query log to file now displays queries with microsecond precission

2007-07-30 11:33:50 +03:00

list.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

make-ccc

Remove unused (and incorrect) my_lread() and my_lwrite()

2006-09-14 23:29:44 -06:00

make-conf.c

Many files:

2006-12-23 20:17:15 +01:00

Makefile.am

Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build

2007-03-12 14:53:52 +01:00

md5.c

Avoid the name conflict between the system-provided "md5.h" and the MySQL one

2007-07-19 14:14:03 +02:00

mf_brkhant.c

Many files:

2006-12-23 20:17:15 +01:00

mf_cache.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_dirname.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_fn_ext.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_format.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_getdate.c

Slow query log to file now displays queries with microsecond precission

2007-07-30 11:33:50 +03:00

mf_iocache2.c

Correct bad merge, and remove version numbers from test case.

2007-08-08 12:21:04 -04:00

mf_iocache.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_keycache.c

Backport of the keycache changes from http://lists.mysql.com/commits/31517 to make keycache 64-bit safe in 5.0. This is for bug #5731.

2007-08-29 20:45:04 +04:00

mf_keycaches.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_loadpath.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_pack.c

Slow query log to file now displays queries with microsecond precission

2007-07-30 11:33:50 +03:00

mf_path.c

Slow query log to file now displays queries with microsecond precission

2007-07-30 11:33:50 +03:00

mf_qsort2.c

Many files:

2006-12-23 20:17:15 +01:00

mf_qsort.c

Many files:

2006-12-23 20:17:15 +01:00

mf_radix.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_same.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_sort.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_soundex.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_strip.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_tempdir.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_tempfile.c

avoid using GetTempFileName in a way it's documented to not work on windows

2007-09-27 08:56:06 +02:00

mf_unixpath.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_util.c

Many files:

2006-12-23 20:17:15 +01:00

mf_wcomp.c

Many files:

2006-12-23 20:17:15 +01:00

mf_wfile.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mulalloc.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_access.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

my_aes.c

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

my_alarm.c

Many files:

2006-12-23 20:17:15 +01:00

my_alloc.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_append.c

Slow query log to file now displays queries with microsecond precission

2007-07-30 11:33:50 +03:00

my_atomic.c

Many files:

2006-12-27 02:23:51 +01:00

my_bit.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

my_bitmap.c

After merge fixes

2007-01-29 01:47:35 +02:00

my_chsize.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_clock.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

my_compress.c

Slow query log to file now displays queries with microsecond precission

2007-07-30 11:33:50 +03:00

my_conio.c

Merge magare.gmz:/home/kgeorge/mysql/autopush/B29325-5.0-opt

2007-07-11 12:44:49 +03:00

my_copy.c

Slow query log to file now displays queries with microsecond precission

2007-07-30 11:33:50 +03:00

my_crc32.c

Many files:

2006-12-23 20:17:15 +01:00

my_create.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_delete.c

Many files:

2006-12-23 20:17:15 +01:00

my_div.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_dup.c

Fixed compiler warnings.

2007-03-22 20:32:07 +02:00

my_error.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_file.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

my_fopen.c

Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris

2007-08-13 16:11:25 +03:00

my_fstream.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_gethostbyname.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

my_gethwaddr.c

mysys/my_gethwaddr.c

2007-08-09 14:56:57 +02:00

my_getncpus.c

Many files:

2006-12-27 02:23:51 +01:00

my_getopt.c

Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines

2007-10-19 13:06:37 -07:00

my_getpagesize.c

Many files:

2006-12-23 20:17:15 +01:00

my_getsystime.c

Fixes Bug#30127: --debug-info no longer prints memory usage in mysql

2007-08-01 22:59:05 +03:00

my_getwd.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_handler.c

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-main

2007-03-28 20:46:42 +03:00

my_init.c

Merge sita.local:/Users/tsmith/m/bk/maint/50

2007-10-04 13:51:27 -06:00

my_largepage.c

Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms.

2007-08-29 19:20:18 +04:00

my_lib.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_libwrap.c

Many files:

2006-12-23 20:17:15 +01:00

my_lock.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

my_lockmem.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_malloc.c

Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms.

2007-08-29 19:20:18 +04:00

my_memmem.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_messnc.c

Many files:

2006-12-23 20:17:15 +01:00

my_mkdir.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

my_mmap.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

my_net.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

my_netware.c

Many files:

2006-12-23 20:17:15 +01:00

my_new.cc

Many files:

2006-12-23 20:17:15 +01:00

my_once.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_open.c

Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris

2007-08-13 16:11:25 +03:00

my_port.c

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

my_pread.c

Added casts to avoid compiler warnings and fixed a wrong type.

2007-05-31 17:45:22 +03:00

my_pthread.c

Portability fix to work around OS X -x86 toolchain bug with common (uninitialized data) symbols

2007-04-04 11:41:43 +02:00

my_quick.c

Added casts to avoid compiler warnings and fixed a wrong type.

2007-05-31 17:45:22 +03:00

my_read.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_realloc.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_redel.c

Merge mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.0-engines

2007-03-29 22:01:51 +05:00

my_rename.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

my_seek.c

Merge mysql.com:/home/svoj/devel/mysql/BUG27141/mysql-5.0-engines

2007-06-05 03:43:11 +05:00

my_sleep.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

my_static.c

Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris

2007-08-13 16:11:25 +03:00

my_static.h

Slow query log to file now displays queries with microsecond precission

2007-07-30 11:33:50 +03:00

my_symlink2.c

Merge magare.gmz:/home/kgeorge/mysql/work/B29325-my_errno-5.0-opt

2007-07-18 15:57:17 +03:00

my_symlink.c

Many files:

2006-12-23 20:17:15 +01:00

my_sync.c

Many files:

2006-12-23 20:17:15 +01:00

my_thr_init.c

Merge hynda.mysql.fi:/home/my/mysql-5.0-marvel

2007-08-21 19:09:46 +03:00

my_vle.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_wincond.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_windac.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_winthread.c

Bug#30992 Wrong implementation of pthread_mutex_trylock()

2007-10-03 21:38:32 +02:00

my_write.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mysys_priv.h

Slow query log to file now displays queries with microsecond precission

2007-07-30 11:33:50 +03:00

ptr_cmp.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

queues.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

rijndael.c

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

safemalloc.c

Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms.

2007-08-29 19:20:18 +04:00

sha1.c

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

2007-01-22 14:04:40 +02:00

string.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

test_charset.c

Fix doxygen warnings.

2007-08-15 17:43:08 +04:00

test_dir.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

test_fn.c

Many files:

2006-12-23 20:17:15 +01:00

test_xml.c

Many files:

2006-12-23 20:17:15 +01:00

testhash.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

thr_alarm.c

Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris

2007-08-13 16:11:25 +03:00

thr_lock.c

Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg21281

2007-08-05 13:26:10 +04:00

thr_mutex.c

Merge moksha.local:/Users/davi/mysql/push/mysql-5.0-runtime

2007-10-09 09:48:49 -03:00

thr_rwlock.c

Many files:

2006-12-23 20:17:15 +01:00

tree.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

trie.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

typelib.c

Merged from main 5.1

2007-05-24 19:47:58 +03:00