unknown b3dd7d5ca6 Merge hynda.mysql.fi:/home/my/mysql-5.1-main ...

into  hynda.mysql.fi:/home/my/mysql-5.1-marvel


client/mysqldump.c:
  Auto merged
sql/event_db_repository.cc:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/sql_yacc.yy:
  Manual merge with 5.1 main tree.

2007-08-22 17:29:38 +03:00

..

atomic

Many files:

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

mysql

Fix doxygen warnings.

2007-08-16 21:14:47 +04: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

Many files:

2007-07-23 23:54:55 +02:00

config-win.h

Many files:

2007-07-23 23:54:55 +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

Added support for 'internal temporary tables' in HEAP tables.

2007-07-25 01:58:12 +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

Added support for 'internal temporary tables' in HEAP tables.

2007-07-25 01:58:12 +03:00

m_ctype.h

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

2007-08-14 00:22:34 +03:00

m_string.h

WL#3914: Additonal accessors required to compile InnoDB as a plugin storage engine

2007-07-05 01:05:47 +02:00

Makefile.am

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

2007-07-30 21:45:06 +02: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

Added support for 'internal temporary tables' in HEAP tables.

2007-07-25 01:58:12 +03:00

my_bitmap.h

Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-main

2007-07-25 15:40:43 +02: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

Slow query log to file now displays queries with microsecond precission

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

my_global.h

Many files:

2007-07-23 23:54:55 +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_md5.h

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

2007-07-19 14:14:03 +02: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 hynda.mysql.fi:/home/my/mysql-5.0-marvel

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

my_sys.h

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

2007-08-13 16:11:25 +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

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

2007-08-13 16:11:25 +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

Add 'extension' field to all client library structures to make them extensible

2007-07-30 06:22:25 +03: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 bk-internal:/home/bk/mysql-5.1-marvel

2007-08-03 17:15:23 +02: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:m/srv/quadxeon/local/bk/maint/jun14/50

2007-06-15 19:06:06 +02:00