unknown 173efef438 Merge kaamos.(none):/data/src/opt/bug31236/my51-bug31236 ...

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


configure.in:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/unireg.h:
  Auto merged

2008-02-20 00:37:51 +03:00

..

atomic

Bug#33728 Atomic builtins

2008-01-11 20:34:36 -02:00

mysql

Never access thd->ha_data directly, use getters/setters from the plugin

2007-08-31 10:19:52 +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

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmerge

2007-10-29 12:42:06 -04: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

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

m_ctype.h

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

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

m_string.h

Merge mysql.com:/misc/mysql/31177/50-31177

2007-12-01 15:53:56 +01:00

Makefile.am

Post merge fix for BUG 33728

2008-01-11 21:34:23 -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

Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl

2008-02-05 14:52:20 +01:00

my_bitmap.h

Bug#31552 Replication breaks when deleting rows from out-of-sync table

2007-12-12 12:14:59 +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

Bug#31177: Server variables can't be set to their current values

2007-12-01 19:55:06 +01:00

my_global.h

Fix for bug #31236: Inconsistent division by zero behavior for

2008-02-20 00:33:43 +03: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 moksha.local:/Users/davi/mysql/push/mysql-5.0-runtime

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

my_sys.h

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

2008-01-30 12:53:33 +01: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

Bug#30273 - merge tables: Can't lock file (errno: 155)

2007-12-11 15:32:10 +01:00

myisampack.h

Many files:

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

mysql_com.h

Merge station.:/mnt/raid/alik/MySQL/devel/5.1

2007-12-14 16:30:22 +03:00

mysql_embed.h

Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server

2007-11-18 00:32:06 +04:00

mysql_h.ic

Bug#12713 "Error in a stored function called from a SELECT doesn't

2007-12-12 18:21:01 +03:00

mysql_time.h

my_strtoll10-x86.s:

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

mysql_version.h.in

Bug #15327: configure: --with-tcp-port option being partially ignored

2007-09-13 16:19:46 +02:00

mysql.h

Merge mysql.com:/Users/davi/mysql/bugs/29592-5.0

2007-11-26 16:10:26 -02:00

mysys_err.h

WL#2936

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

queues.h

Bug #31890 Partitions: ORDER BY DESC in InnoDB not working.

2007-11-14 22:20:31 +04: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

Cleanup: use helper functions to set an error in MYSQL or MYSQL_STMT.

2007-10-31 17:16:53 +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