unknown 3c3f9d9022 Merge bodhi.local:/opt/local/work/tmp_merge ...

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-mysqld_safe-watch.sh~37cbc9a97ffd2555:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysys/my_handler.c:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/heap/hp_test1.c:
  Auto merged
storage/heap/hp_test2.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
sql/table.cc:
  Use local (manual merge)
mysql-test/mysql-test-run.sh:
  Manual merge.
sql/ha_ndbcluster.cc:
  Manual merge.
sql/item.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.

2006-07-13 22:09:36 +04:00

..

atomic

atomic ops:

2006-06-17 16:20:39 +02:00

mysql

Build fixes for Windows, Solaris, HPUX, AIX.

2006-06-24 07:45:23 +02:00

.cvsignore

…

base64.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

config-netware.h

Several Netware specific fixes.

2006-02-02 16:22:31 +02:00

config-win.h

Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge

2006-06-13 16:06:35 -04:00

decimal.h

A lot of fixes to Precision math

2005-05-05 20:06:49 +05:00

errmsg.h

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

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

ft_global.h

WL#2575 - Fulltext: Parser plugin for FTS

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

hash.h

A fix for Bug#7209 "Client error with "Access Denied" on updates

2006-01-04 17:35:30 +03:00

heap.h

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

2006-06-04 21:05:22 +03: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

Fix spelling in comments as requested by Osku

2006-05-02 09:13:58 -04:00

m_string.h

Polishing: C_STRING_WITH_SIZE() was renamed to C_STRING_WITH_LEN().

2006-06-19 15:17:15 +04:00

Makefile.am

Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge

2006-06-25 09:59:34 -04: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

atomic ops:

2006-06-17 16:20:39 +02:00

my_base.h

Merge mysql.com:/home/dlenev/mysql-5.0-bg18437-3

2006-07-02 02:12:53 +04: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 mysql.com:/usr/local/mysql/mysql-5.0-vgfix

2006-05-16 14:34:35 +02:00

my_dir.h

…

my_getopt.h

…

my_global.h

Merge bodhi.local:/opt/local/work/tmp_merge

2006-07-13 22:09:36 +04: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

removing MSDOS defines and code

2006-05-08 14:50:13 -05: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

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

2006-05-19 19:07:33 -07:00

my_semaphore.h

…

my_sys.h

Correcting signature for my_strndup to be able to build on Windows

2006-07-07 15:59:17 +02:00

my_time.h

Reorganize, physically the events code

2006-06-08 23:07:11 +02: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

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

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

Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster)

2006-06-14 11:08:36 +02:00

mysql_embed.h

remove the rest of isam/merge references

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

mysql_time.h

…

mysql_version.h.in

…

mysql.h

Merge neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208

2006-04-26 22:24:25 +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

bug #20318 (ctype_ucs2_def test fails with embedded)

2006-06-19 22:11:01 +05: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