unknown 92a46e0579 Merge trift2.:/MySQL/M51/mysql-5.1 ...

into  trift2.:/MySQL/M51/push-5.1


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
CMakeLists.txt:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged

2007-06-06 19:59:18 +02:00

..

atomic

Many files:

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

mysql

WL#2936

2007-05-01 18:25:29 -07:00

.cvsignore

…

base64.h

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

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

config-netware.h

sql_parse.cc, config-win.h, config-netware.h:

2007-05-27 23:21:03 +02:00

config-win.h

Merge trift2.:/MySQL/M51/mysql-5.1

2007-06-04 11:24:49 +02:00

decimal.h

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

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

errmsg.h

Added more descriptive error message of why statement was automaticly dropped

2007-04-13 01:56:22 +03:00

ft_global.h

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

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

hash.h

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

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

heap.h

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

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

help_end.h

my_strtoll10-x86.s:

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

help_start.h

my_strtoll10-x86.s:

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

keycache.h

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

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

m_ctype.h

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

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

m_string.h

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51

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

Makefile.am

Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0

2007-04-26 16:06:44 +02:00

md5.h

Many files:

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

my_aes.h

my_strtoll10-x86.s:

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

my_alarm.h

Many files:

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

my_alloc.h

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

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

my_atomic.h

move intptr from my_atomic.h to my_global.h

2007-01-28 21:12:58 +01:00

my_attribute.h

Bug#25118 ATTRIBUTE_FORMAT_FPTR undeclared in m_ctype.h

2007-04-12 00:43:25 +02:00

my_base.h

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

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

my_bitmap.h

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

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

my_dbug.h

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

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

my_dir.h

Many files:

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

my_getopt.h

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

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

my_global.h

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51

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

my_handler.h

my_strtoll10-x86.s:

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

my_libwrap.h

Many files:

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

my_list.h

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

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

my_net.h

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

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

my_no_pthread.h

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

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

my_nosys.h

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

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

my_pthread.h

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

2007-06-01 12:12:06 +04:00

my_sys.h

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

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

my_time.h

Backport of TIME->MYSQL_TIME / Y2K fixset

2007-05-16 10:44:59 +02:00

my_tree.h

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

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

my_trie.h

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

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

my_uctype.h

Many files:

2006-12-31 02:29:11 +01:00

my_user.h

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

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

my_vle.h

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

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

my_xml.h

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

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

myisam.h

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

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

myisammrg.h

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

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

myisampack.h

Many files:

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

mysql_com.h

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51

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

mysql_embed.h

Many files:

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

mysql_h.ic

Change find_type family to accept const TYPELIB*.

2007-03-27 20:27:58 +04:00

mysql_time.h

my_strtoll10-x86.s:

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

mysql_version.h.in

…

mysql.h

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

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

mysys_err.h

WL#2936

2007-03-02 08:43:45 -08:00

queues.h

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

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

rijndael.h

my_strtoll10-x86.s:

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

sha1.h

my_strtoll10-x86.s:

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

sql_common.h

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

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

sslopt-case.h

Many files:

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

sslopt-longopts.h

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

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

sslopt-vars.h

Many files:

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

t_ctype.h

Many files:

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

thr_alarm.h

restored run-time thread lib detection

2007-03-28 15:33:29 +02:00

thr_lock.h

Merge olga.mysql.com:/home/igor/mysql-5.0-opt

2007-06-04 03:16:17 -07:00

typelib.h

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines

2007-04-27 19:09:39 +02:00

violite.h

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51

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