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

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


include/mysql.h:
  Auto merged
include/sql_common.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/ps.result:
  Manual merge.
mysql-test/r/sp.result:
  Manual merge.
mysql-test/t/ps.test:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
sql/sql_prepare.cc:
  Manual merge.
sql/table.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.

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

..

.cvsignore

…

base64.h

WL#2835: Base64 mysys functions

2005-10-14 01:14:23 +02:00

config-netware.h

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

2006-01-12 20:28:23 +02:00

config-os2.h

…

config-win.h

Fixed Bug#19479:mysqldump creates invalid dump.

2006-06-01 12:34:44 +03: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

indexless boolean fulltext search was depending on default_charset_info - Bug#8159

2005-02-04 15:24: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

Bug #12796: Record lost in HEAP table

2005-11-08 00:26:37 -05: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 abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1

2006-03-23 14:29:43 +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

Fix for Bug#18246 "compilation error with tcp_wrapper"

2006-06-21 02:23:18 +03: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

Merge bk-internal:/home/bk/mysql-5.0-engines

2006-07-18 10:25:04 -07:00

my_bitmap.h

Bug#10932 - Building server with key limit of 128, makes test cases fail

2005-07-19 14:13:56 +02:00

my_dbug.h

Fix two Valgrind memory leak warnings.

2006-05-15 18:07:18 +02:00

my_dir.h

…

my_getopt.h

Merge with 4.0

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

my_global.h

mysql.spec.sh:

2006-06-30 02:49:28 +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

BUG#7384 IM fails to compile on Solaris.

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

my_no_pthread.h

Include the system header file "pthread.h" even in a non-threaded build.

2006-03-10 17:13:54 +01:00

my_nosys.h

…

my_pthread.h

Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711

2006-05-19 13:09:15 +02:00

my_semaphore.h

…

my_sys.h

my_sys.h:

2006-07-01 15:11:59 +02:00

my_time.h

Fixes during review of new pushed code

2005-07-31 12:49:55 +03:00

my_tree.h

BUG#18160 - Memory-/HEAP Table endless growing indexes

2006-04-19 15:13:50 +05:00

my_user.h

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

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

my_xml.h

…

myisam.h

WL#2645 (CHECK TABLE FOR UPGRADE)

2006-02-17 10:52:32 +04:00

myisammrg.h

…

myisampack.h

Casted all macro arguments,

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

mysql_com.h

A fix and a test case for Bug#15752 "Lost connection to MySQL server

2006-07-24 14:56:53 +04: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

…

mysql.h

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

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

mysys_err.h

Show all generated warnings in SHOW ERROR

2005-02-24 23:33:42 +02:00

queues.h

Fix for BUG#4177:

2004-11-21 11:51:19 +03:00

raid.h

BUG#10241 cygwin port: invalid pragma interface directives

2005-05-04 15:05:56 +02: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

…

thr_lock.h

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

2005-07-28 17:09:54 +03:00

typelib.h

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

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

violite.h

Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files

2006-05-31 22:21:40 +02:00