unknown 047ec78f2c Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl ...

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


mysql-test/include/have_multi_ndb.inc:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
  Auto merged
mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
  Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event_old.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/rpl_rli.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_binlog.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_string.cc:
  Auto merged
mysql-test/Makefile.am:
  SCCS merged
mysql-test/mysql-test-run.pl:
  Manual merge.
mysql-test/suite/binlog/t/disabled.def:
  Manual merge.
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Manual merge.
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Manual merge.
sql/log_event.cc:
  Manual merge.
  ,

2007-12-19 18:51:46 +01:00

..

.cvsignore

…

CMakeLists.txt

CMakeLists.txt, README, configure.js

2007-08-03 21:51:37 +02: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

Add mysql-test/lib/*.sql to dists*

2007-11-23 18:12:14 +01:00

make_sharedlib_distribution.sh

my_strtoll10-x86.s:

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

make_win_bin_dist

Merge polly.(none):/home/kaa/src/opt/bug32221/my50-bug31445

2007-11-22 17:17:32 +03:00

Makefile.am

Merge trift2.:/MySQL/M51/bug31644-5.1

2007-10-19 19:22:27 +02:00

msql2mysql.sh

gen_lex_hash.cc:

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

mysql_config.sh

Merge ramayana.hindu.god:/home/tsmith/m/bk/51

2007-09-28 10:55:28 -06: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_extensions.sh tool copied from 4.0 tree (referenced in manual).

2002-05-16 10:13:42 +10:00

mysql_fix_privilege_tables.sh

Bug #15327: configure: --with-tcp-port option being partially ignored

2007-09-13 16:19:46 +02:00

mysql_install_db.sh

after-merge fix

2007-12-10 12:21:02 +01: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

Option 6 tries to grant global privileges at the database level

2007-08-01 11:58:25 +02:00

mysql_system_tables_data.sql

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

2007-12-10 12:16:41 +01:00

mysql_system_tables_fix.sql

Fix for BUG#24923: Functions with ENUM issues.

2007-10-17 12:13:56 +04:00

mysql_system_tables.sql

Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines

2007-10-19 13:06:37 -07: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

Modify "mysqlbug" ("scripts/mysqlbug.sh") so that it differs between the original

2007-10-18 12:03:30 +02: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 zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

2007-10-08 12:40:21 -04: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

Bug #27694: mysqlhotcopy & p5-DBD-mysql51-4.003

2007-08-20 11:00:51 -06:00