unknown d6e2895da7 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 ...

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


configure.in:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/ndb_update.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/ndb/include/util/OutputStream.hpp:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql/sql_cache.cc:
  Merge

2006-11-30 15:31:20 +01:00

..

atomic

support for xadd emulation, workaround for Darwin

2006-06-29 15:39:53 +02:00

mysql

This patch fixes the example engine, the example parser, and the example daemon to compile. AKA You can now test that the interface is actually working :)

2006-11-10 17:21:59 -08:00

.cvsignore

…

abi_check

Make --mem settable with environment variable MTR_MEM and make it possible to pass the directory to use. I.e --mem=<directory>

2006-11-07 11:07:27 +01:00

base64.h

BUG#19459 (BINLOG RBR command does not lock tables correctly causing

2006-10-02 15:05:05 +02:00

config-netware.h

Merge moonbone.local:/work/tmp_merge-5.0-mysql

2006-08-29 18:58:50 +04:00

config-win.h

Windows 64bit fixes

2006-09-21 15:19:20 +02:00

decimal.h

Bug#16172 DECIMAL data type processed incorrectly

2006-08-08 16:03:42 +05:00

errmsg.h

Merge mysql.com:/home/my/mysql-5.0

2006-11-27 01:51:50 +02:00

ft_global.h

WL#2575 - Fulltext: Parser plugin for FTS

2005-11-06 13:13:06 +01:00

hash.h

Small cleanup in code handling stored routines/table prelocking.

2006-11-01 15:41:48 +03:00

heap.h

This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).

2006-09-30 12:49:46 -07:00

help_end.h

Several fixes for Netware.

2005-08-24 22:03:34 +03:00

help_start.h

Several fixes for Netware.

2005-08-24 22:03:34 +03:00

keycache.h

Bug#12920 - key_read_requests counter appears to re-set

2005-09-14 13:18:16 +02:00

m_ctype.h

Merge mysql.com:/usr/home/bar/mysql-5.0-rpl

2006-11-03 10:29:44 +04:00

m_string.h

Merge rama.(none):/home/jimw/my/mysql-5.0-clean

2006-09-28 20:20:33 -07:00

Makefile.am

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

2006-11-04 09:32:36 +01:00

md5.h

…

my_aes.h

…

my_alarm.h

…

my_alloc.h

Fix incorrect spellings of "dropped" in source and tests. (Bug #12828)

2005-08-30 12:24:37 -07:00

my_atomic.h

compile-time definition of intptr type

2006-08-01 14:02:19 +02:00

my_base.h

Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt

2006-10-19 16:43:46 +02:00

my_bitmap.h

This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes

2006-06-04 18:52:22 +03:00

my_dbug.h

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016

2006-10-17 12:00:36 -04:00

my_dir.h

…

my_getopt.h

…

my_global.h

Removed compiler warnings

2006-11-27 18:16:08 +02:00

my_handler.h

After merge fixes

2006-06-30 20:07:33 +03:00

my_libwrap.h

Cleanup to patch for Bug#18246, "compilation error with tcp_wrapper"

2006-06-21 18:35:19 +03:00

my_list.h

Rename rest() macro in my_list.h to list_rest(). (Bug #12327)

2005-08-09 18:02:36 -07:00

my_net.h

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

2006-09-15 18:19:09 -04:00

my_no_pthread.h

UNIXWARE removal

2006-04-17 15:56:59 -07:00

my_nosys.h

removing MSDOS defines and code

2006-05-08 14:50:13 -05:00

my_pthread.h

Make IM compiled on Win32: add pthread_join() impl.

2006-11-22 17:14:43 +03:00

my_semaphore.h

…

my_sys.h

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1

2006-11-30 15:31:20 +01:00

my_time.h

Merge bk@192.168.21.1:mysql-5.1-opt

2006-11-17 19:01:35 +04:00

my_tree.h

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

2006-05-08 15:15:05 -05:00

my_trie.h

WL#2466 - Fulltext: "always-index" words

2005-06-07 21:17:09 +05:00

my_uctype.h

WL#1386 - CTYPE table for unicode character sets

2006-02-02 10:07:47 +04:00

my_user.h

Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause

2006-01-11 02:07:40 +03:00

my_vle.h

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

my_xml.h

Adding XPath support: ExtractValue and UpdateXML functions.

2005-12-21 17:13:52 +04:00

myisam.h

Merge chilla.local:/home/mydev/mysql-5.0-bug8283

2006-10-09 22:24:55 +02:00

myisammrg.h

This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes

2006-06-04 18:52:22 +03:00

myisampack.h

…

mysql_com.h

Merge siva.hindu.god:/usr/home/tim/m/bk/g51

2006-09-29 17:01:16 -06:00

mysql_embed.h

remove the rest of isam/merge references

2005-04-05 13:17:49 +02:00

mysql_h.ic

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

2006-11-03 14:40:52 +01:00

mysql_time.h

…

mysql_version.h.in

…

mysql.h

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint

2006-10-24 21:05:35 +02:00

mysys_err.h

After merge fixes

2006-05-04 06:28:24 +03:00

queues.h

WL#1034 update

2005-12-12 21:19:19 +01:00

rijndael.h

…

sha1.h

A fix for Bug#13944 "libmysqlclient exporting sha1_result function":

2006-01-11 17:31:52 +03:00

sql_common.h

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

2006-08-02 14:13:01 +04:00

sslopt-case.h

…

sslopt-longopts.h

Merge mysql.com:/home/jimw/my/mysql-5.0-1039

2006-05-19 16:17:24 -07:00

sslopt-vars.h

Merge mysql.com:/home/jimw/my/mysql-5.0-1039

2006-05-19 16:17:24 -07:00

t_ctype.h

…

thr_alarm.h

Another long patch to remove the rest of the OS2 support.

2006-04-15 08:49:00 -07:00

thr_lock.h

WL #2604: Partition Management

2006-01-17 08:40:00 +01:00

typelib.h

…

violite.h

Re-apply missing changeset, orignally pushed by elliot

2006-06-06 14:21:07 +03:00