unknown 230f589f51 Merge elkin@aelkin2.mysql.internal:MySQL/TEAM/FIXES/5.1/bug31609-conflict_detection ...

into  dl145j.mysql.com:/tmp/andrei/bug31552


mysql-test/extra/rpl_tests/rpl_row_basic.test:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/log_event.cc:
  manual merge

2007-12-12 11:21:54 +01:00

..

atomic

Many files:

2006-12-27 02:23:51 +01: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 moksha.local:/Users/davi/mysql/push/mysql-5.0-runtime

2007-10-09 09:48:49 -03: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

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

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

Makefile.am

Temp disable of icheck

2007-08-28 12:41:25 +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

Bug#31702 (Missing row on slave causes assertion failure under row-based replication):

2007-10-20 18:19:55 +02: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#31382

2007-10-04 10:55:08 -07:00

my_global.h

Merge polly.(none):/home/kaa/src/maint/bug31254/my50-bug31254

2007-10-12 14:52:02 +04: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 ramayana.hindu.god:/home/tsmith/m/bk/build/b20748/50

2007-11-07 15:47:25 -07: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

Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS

2007-11-13 13:24:48 +00:00

mysql_embed.h

Many files:

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

mysql_h.ic

Update the client ABI to reflect member rename

2007-10-16 20:21:40 +04: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 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

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