unknown 72e0d8b40b Merge xiphis.org:/home/antony/work2/mysql-5.1-engines ...

into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge


include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  manual change to new api

2007-05-04 23:35:14 -07:00

..

.cvsignore

…

CMakeLists.txt

Minor fixes.

2007-04-24 12:41:08 -04:00

comp_sql.c

Add "name of struct" as first arg to comp_sql

2007-04-23 14:01:48 +02:00

fill_help_tables.sql

More changes to reflect the removal of manual.texi from the sources:

2005-04-13 18:29:23 +02:00

make_binary_distribution.sh

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-release

2007-04-10 13:15:07 +02:00

make_sharedlib_distribution.sh

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

make_win_bin_dist

Don't copy any subdirs in scripts/

2007-04-23 18:16:57 +02:00

Makefile.am

Merge trift2.:/MySQL/M50/netware-cross-5.0

2007-05-03 18:08:06 +02:00

msql2mysql.sh

gen_lex_hash.cc:

2007-01-31 00:06:42 +01:00

mysql_config.sh

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

mysql_convert_table_format.sh

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

mysql_find_rows.sh

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

mysql_fix_extensions.sh

…

mysql_fix_privilege_tables.sh

Bug#20166 mysql-test-run.pl does not test system privilege tables creation

2007-02-26 11:49:24 +01:00

mysql_install_db.sh

Merge xiphis.org:/home/antony/work2/mysql-5.1-engines

2007-05-04 23:35:14 -07:00

mysql_secure_installation.sh

Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build

2007-01-01 05:31:23 +01:00

mysql_setpermission.sh

…

mysql_system_tables_data.sql

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

2007-04-13 15:13:12 +02:00

mysql_system_tables_fix.sql

Merge pilot.blaudden:/home/msvensson/mysql/my51-m-mysql_upgrade

2007-04-24 11:11:45 +02:00

mysql_system_tables.sql

Update mysql_upgrade tests for 5.1

2007-04-18 16:23:19 +02:00

mysql_test_data_timezone.sql

Bug#20166 mysql-test-run.pl does not test system privilege tables creation

2007-02-26 11:49:24 +01:00

mysql_zap.sh

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

mysqlaccess.conf

…

mysqlaccess.sh

BUG#24780 workaround for broken installations that depend on using /etc, but were configured differently

2007-01-09 09:32:56 +01:00

mysqlbug.sh

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

2007-01-11 09:43:44 -05:00

mysqld_multi.sh

Bug #27390: mysqld_multi --config-file= not working as documented

2007-04-28 01:27:54 +02:00

mysqld_safe.sh

Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint

2006-12-14 12:21:37 -08:00

mysqldumpslow.sh

Search through options to find where the slow query log actually is.

2006-12-18 21:12:01 -08:00

mysqlhotcopy.sh

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

2006-10-03 09:05:34 +02:00