unknown d69c6627ba Merge chilla.local:/home/mydev/mysql-5.1-amain ...

into  chilla.local:/home/mydev/mysql-5.1-axmrg


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged

2007-06-16 13:14:23 +02: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

…

ChangeLog

…

charset-def.c

…

charset.c

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

2007-05-10 12:59:39 +03: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

Makefile.am:

2007-03-22 16:53:37 +01:00

default_modify.c

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

2007-05-10 12:59:39 +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

…

hash.c

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

2007-05-31 17:45:22 +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

…

make-conf.c

…

Makefile.am

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

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

md5.c

…

mf_brkhant.c

…

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

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

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

mf_iocache2.c

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

2007-05-10 12:59:39 +03: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

Merge chilla.local:/home/mydev/mysql-5.1-amain

2007-06-11 19:25:12 +02: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

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

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

mf_path.c

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

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

mf_qsort2.c

…

mf_qsort.c

…

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

Bug#26233 very suspect code in mf_tempfile.c, in function create_temp_file()

2007-03-23 11:01:47 +01: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

…

mf_wcomp.c

…

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

…

my_aes.c

…

my_alarm.c

…

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

…

my_atomic.c

…

my_bit.c

…

my_bitmap.c

…

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

…

my_compress.c

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

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

my_conio.c

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

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

my_copy.c

Merge damien-katzs-computer.local:/Users/dkatz/mysql50

2007-04-30 17:47:58 -04:00

my_crc32.c

…

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

…

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

…

my_fopen.c

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

2007-05-10 12:59:39 +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

…

my_gethwaddr.c

…

my_getncpus.c

…

my_getopt.c

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1

2007-05-24 13:24:36 +03:00

my_getpagesize.c

…

my_getsystime.c

…

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 quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51

2007-06-05 17:51:30 +02:00

my_largepage.c

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

2007-05-10 12:59:39 +03: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

…

my_lock.c

…

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

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

2007-05-10 12:59:39 +03: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

…

my_mkdir.c

…

my_mmap.c

…

my_net.c

…

my_netware.c

…

my_new.cc

…

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

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

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

my_port.c

…

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

…

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

…

my_static.c

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1

2007-05-24 15:26:10 +03:00

my_static.h

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

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

my_symlink2.c

…

my_symlink.c

…

my_sync.c

…

my_thr_init.c

Merge pilot.(none):/data/msvensson/mysql/bug28690/my50-bug28690

2007-06-07 09:50:53 +02: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

…

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

…

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

…

safemalloc.c

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

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

sha1.c

…

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

…

test_dir.c

…

test_fn.c

…

test_xml.c

…

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

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

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

thr_lock.c

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

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

thr_mutex.c

…

thr_rwlock.c

…

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