Commit c431ab11 authored by unknown's avatar unknown
Browse files

Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166 

into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
  Auto merged
BitKeeper/deleted/.del-mysql_create_system_tables.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
mysql-test/t/ndb_multi.test:
  Auto merged
scripts/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
  Auto merged
mysql-test/r/mysql_upgrade.result:
  SCCS merged
mysql-test/t/lock_multi.test:
  Use local
mysql-test/t/rpl_temporary.test:
  Use local
mysql-test/Makefile.am:
  Manual merge
scripts/mysql_fix_privilege_tables.sh:
  Manual merge
scripts/mysql_fix_privilege_tables.sql.in:
  Manual merge
scripts/mysql_install_db.sh:
  Manual merge
parents 1e98e7bf 5d4e0417

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1813,6 +1813,7 @@ scripts/mysql_explain_log 
scripts/mysql_find_rows

scripts/mysql_fix_extensions

scripts/mysql_fix_privilege_tables

scripts/mysql_fix_privilege_tables.sql

scripts/mysql_install_db

scripts/mysql_secure_installation

scripts/mysql_setpermission

mysql-test/Makefile.am

+0 −2
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ dist-hook: 
	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50/BACKUP* $(distdir)/std_data/ndb_backup50

	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51/BACKUP* $(distdir)/std_data/ndb_backup51

	$(INSTALL_DATA) $(srcdir)/lib/init_db.sql $(distdir)/lib

	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib



install-data-local:
@@ -112,7 +111,6 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup50

	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51

	$(INSTALL_DATA) $(srcdir)/lib/init_db.sql $(DESTDIR)$(testdir)/lib

	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib



uninstall-local:

mysql-test/include/add_anonymous_users.inc

0 → 100644
+7 −0
Original line number Diff line number Diff line 
# Allow anonymous users to connect 

disable_warnings;

disable_query_log;

INSERT INTO mysql.user (host, user) VALUES ('localhost','');

FLUSH PRIVILEGES;

enable_query_log;

enable_warnings;

mysql-test/include/delete_anonymous_users.inc

0 → 100644
+5 −0
Original line number Diff line number Diff line 
# Remove anonymous users added by add_anonymous_users.inc

disable_query_log;

DELETE FROM mysql.user where host='localhost' and user='';

FLUSH PRIVILEGES;

enable_query_log;

mysql-test/lib/init_db.sql

deleted100644 → 0
+0 −651

File deleted.

Preview size limit exceeded, changes collapsed.