unknown e54ecf09be Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525 ...

into  mysql.com:/home/dlenev/src/mysql-5.1-merges2


client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisammrg/myrg_queue.c:
  Auto merged
sql/sql_rename.cc:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge.

2006-02-27 20:00:07 +03:00

..

mysql

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

2006-02-14 22:57:12 +01:00

.cvsignore

…

base64.h

WL#1012: All changes as one single changeset.

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

config-netware.h

Several Netware specific fixes.

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

config-os2.h

…

config-win.h

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

2006-02-17 12:16:36 +01:00

decimal.h

A lot of fixes to Precision math

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

errmsg.h

A fix and a test case for Bug#9643 " CURSOR_TYPE_SCROLLABLE dos not work"

2005-05-16 18:27:21 +04: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 mysql.com:/home/kostja/mysql/tmp_merge

2006-02-08 23:53:45 +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

WL#1386 - CTYPE table for unicode character sets

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

m_string.h

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp

2005-10-13 18:23:53 +03:00

Makefile.am

This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support.

2006-02-24 13:20:51 -08: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_base.h

Merging 5.0->5.1

2006-02-17 11:26:03 +04:00

my_bitmap.h

Compile fixes for aix52-64bit.

2006-01-01 22:18:02 +01:00

my_dbug.h

dbug changes:

2006-02-14 22:36:11 +01:00

my_dir.h

Fix for Bug #1952

2003-12-12 03:39:29 +03:00

my_getopt.h

Merge with 4.0

2004-09-01 04:12:09 +03:00

my_global.h

Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525

2006-02-27 20:00:07 +03:00

my_handler.h

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

2005-10-27 23:43:20 +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

BUG#7384 IM fails to compile on Solaris.

2004-12-18 03:21:20 +03:00

my_no_pthread.h

…

my_nosys.h

…

my_pthread.h

Fast mutexes implementation

2005-12-20 14:56:45 +01:00

my_semaphore.h

…

my_sys.h

This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support.

2006-02-24 13:20:51 -08:00

my_time.h

- fix bug #16435 (Weekly events execute every second) (WL#1034 Internal CRON)

2006-01-18 20:41:22 +01:00

my_tree.h

after merge fixes

2004-03-18 00:09:13 +02: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 patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support.

2006-02-24 13:20:51 -08:00

myisammrg.h

key_cmp -> key_cmp_if_same

2004-05-16 14:48:32 +03:00

myisampack.h

Casted all macro arguments,

2004-07-28 21:46:22 +02:00

mysql_com.h

Merge BUG#15110 from 5.0 into 5.1.

2006-01-13 19:09:27 +03:00

mysql_embed.h

remove the rest of isam/merge references

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

mysql_time.h

Fix for bug #6266 "Invalid DATETIME value is not handled properly".

2004-11-15 15:44:29 +03:00

mysql_version.h.in

Merge with 4.0 to get fixes for Windows project files

2004-05-25 02:47:25 +03:00

mysql.h

Fixes to embedded server to be able to run tests with it

2006-02-24 18:34:15 +02:00

mysys_err.h

Show all generated warnings in SHOW ERROR

2005-02-24 23:33:42 +02: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

Remove stale declaration, fix a typo in comment.

2004-10-15 22:03:11 +04:00

sslopt-case.h

…

sslopt-longopts.h

…

sslopt-vars.h

…

t_ctype.h

…

thr_alarm.h

Added patches from Novell

2004-05-25 22:00:14 +03:00

thr_lock.h

WL #2604: Partition Management

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

typelib.h

Bug#6202: ENUMs are not case sensitive even if declared BINARY

2004-10-25 17:51:26 +05:00

violite.h

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

2005-09-12 17:00:50 -07:00