unknown 61f4440c29 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main ...

into  mysql.com:/home/stewart/Documents/MySQL/5.1/main


mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/valgrind.supp:
  Manual merge

2006-06-16 18:54:20 +10:00

..

yassl

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main

2006-06-16 18:54:20 +10:00

.cvsignore

Import changeset

2000-07-31 21:29:14 +02:00

charset2html.c

dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features

2004-11-04 22:29:00 +01:00

CMakeLists.txt

performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1.

2006-05-11 11:29:08 -05:00

comp_err.c

Define USE_TLS when compiling libmysql.dll, to avoid crashing when

2006-03-22 09:55:26 +01:00

innochecksum.c

Fix QNX and IRIX compilation

2005-12-08 15:13:25 +01:00

Makefile.am

Rename cmakelists.txt -> CMakeLists.txt

2006-05-12 10:51:07 +02:00

my_print_defaults.c

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

2005-08-26 15:56:52 +03:00

mysql_waitpid.c

Added global my_getopt_error_reporter function pointer which is

2004-08-31 21:27:58 +05:00

perror.c

Merge mysql.com:/home/kostja/mysql/mysql-5.0-root

2006-02-09 13:35:59 +03:00

replace.c

fix for bug#5650 ('replace' does not follow symlinks)

2005-07-26 07:41:32 +02:00

resolve_stack_dump.c

Several fixes for Netware.

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

resolveip.c

UNIXWARE removal

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