Commit be1fb160 authored by unknown's avatar unknown
Browse files

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

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
mysql-test/mysql-test-run.pl:
  Auto merged
netware/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
tests/Makefile.am:
  Auto merged
mysql-test/install_test_db.sh:
  Manual merge
sql/sql_acl.h:
  Manual merge
parents 56ce4907 0eec6c13

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -1763,7 +1763,9 @@ netware/.deps/my_manage.Po 
netware/.deps/mysql_install_db.Po

netware/.deps/mysql_test_run.Po

netware/.deps/mysqld_safe.Po

netware/init_db.sql

netware/libmysql.imp

netware/test_db.sql

pack_isam/*.ds?

perror/*.ds?

perror/*.vcproj

mysql-test/install_test_db.sh

+8 −10
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ if [ x$1 = x"--bin" ]; then 
  BINARY_DIST=1



  bindir=../bin

  scriptdir=../bin

  scriptdir=bin

  libexecdir=../libexec



  # Check if it's a binary distribution or a 'make install'
@@ -33,7 +33,7 @@ if [ x$1 = x"--bin" ]; then 
  then

    execdir=../../sbin

    bindir=../../bin

    scriptdir=../../bin

    scriptdir=../bin

    libexecdir=../../libexec

  else

    execdir=../bin
@@ -43,7 +43,7 @@ else 
  execdir=../sql

  bindir=../client

  fix_bin=.

  scriptdir=../scripts

  scriptdir=scripts

  libexecdir=../libexec

fi
@@ -99,15 +99,13 @@ if [ x$BINARY_DIST = x1 ] ; then 
basedir=..

else

basedir=.

EXTRA_ARG="--language=../sql/share/english/ --character-sets-dir=../sql/share/charsets/"

EXTRA_ARG="--windows"

fi



mysqld_boot="${MYSQLD_BOOTSTRAP-$mysqld}"



mysqld_boot="$mysqld_boot --no-defaults --bootstrap --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb --skip-ndbcluster --tmpdir=. $EXTRA_ARG"

echo "running $mysqld_boot"



if $scriptdir/mysql_create_system_tables test $mdata $hostname | $mysqld_boot

INSTALL_CMD="$scriptdir/mysql_install_db --no-defaults $EXTRA_ARG --basedir=$basedir --datadir=mysql-test/$ldata --srcdir=."

echo "running $INSTALL_CMD"

cd ..

if $INSTALL_CMD

then

    exit 0

else

mysql-test/mysql-test-run.pl

+11 −3
Original line number Diff line number Diff line
@@ -1496,8 +1496,16 @@ sub executable_setup () { 
  if (!$opt_extern)

  {

    # Look for SQL scripts directory

    if ( mtr_file_exists("$path_share/mysql_system_tables.sql") ne "")

    {

      # The SQL scripts are in path_share

      $path_sql_dir= $path_share;

    }

    else

    {

      $path_sql_dir= mtr_path_exists("$glob_basedir/share",

				     "$glob_basedir/scripts");

    }



    if ( $mysql_version_id >= 50100 )

    {

netware/Makefile.am

+24 −4
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ link_sources: 
	done

else



BUILT_SOURCES =                 libmysql.imp

DISTCLEANFILES =                $(BUILT_SOURCES)

BUILT_SOURCES =                 libmysql.imp init_db.sql test_db.sql

CLEANFILES =                    $(BUILT_SOURCES)



# Create the libmysql.imp from libmysql/libmysql.def

libmysql.imp: $(top_srcdir)/libmysql/libmysql.def
@@ -63,7 +63,7 @@ libmysql.imp: $(top_srcdir)/libmysql/libmysql.def 
             x>1 {printf(",\n %s", $$1); next} \

             /EXPORTS/{x=1}' $(top_srcdir)/libmysql/libmysql.def > libmysql.imp



EXTRA_DIST=	$(BUILT_SOURCES) comp_err.def init_db.sql install_test_db.ncf \

EXTRA_DIST=	$(BUILT_SOURCES) comp_err.def install_test_db.ncf \

		libmysql.def \

		libmysqlmain.c my_manage.c my_manage.h \

		my_print_defaults.def myisam_ftdump.def myisamchk.def \
@@ -77,7 +77,7 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def init_db.sql install_test_db.ncf \ 
		mysqlshow.def mysqltest.def mysqlslap.def mysql_upgrade.def \

		perror.def \

		mysql_client_test.def \

		replace.def resolve_stack_dump.def resolveip.def test_db.sql \

		replace.def resolve_stack_dump.def resolveip.def \

		static_init_db.sql \

		BUILD/apply-patch BUILD/compile-AUTOTOOLS \

		BUILD/compile-linux-tools BUILD/compile-netware-END \
@@ -88,6 +88,26 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def init_db.sql install_test_db.ncf \ 
		BUILD/cron-build BUILD/crontab BUILD/knetware.imp \

		BUILD/mwasmnlm BUILD/mwccnlm BUILD/mwenv BUILD/mwldnlm \

		BUILD/nwbootstrap BUILD/openssl.imp BUILD/save-patch





# Build init_db.sql from the files that contain

# the system tables for this version of MySQL plus any commands

init_db.sql: $(top_srcdir)/scripts/mysql_system_tables.sql \

             $(top_srcdir)/scripts/mysql_system_tables_data.sql

	@echo "Building $@";

	@echo "CREATE DATABASE mysql;" > $@;

	@echo "CREATE DATABASE test;" >> $@;

	@echo "use mysql;" >> $@;

	@cat $(top_srcdir)/scripts/mysql_system_tables.sql \

             $(top_srcdir)/scripts/mysql_system_tables_fix.sql >> $@;



# Build test_db.sql from init_db.sql plus

# some test data

test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql

	@echo "Building $@";

	@cat init_db.sql \

             $(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@;



endif



# Don't update the files from bitkeeper

netware/init_db.sql

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
CREATE DATABASE mysql;

CREATE DATABASE test;



USE mysql;



CREATE TABLE db (Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Select_priv enum('N','Y') DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') DEFAULT 'N' NOT NULL, References_priv enum('N','Y') DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL, PRIMARY KEY Host (Host,Db,User), KEY User (User)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Database privileges';



INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');

INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');

 

CREATE TABLE host (Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, Select_priv enum('N','Y') DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') DEFAULT 'N' NOT NULL, References_priv enum('N','Y') DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL, PRIMARY KEY Host (Host,Db)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Host privileges;  Merged with database privileges';



CREATE TABLE user (Host char(60) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Password char(41) binary DEFAULT '' NOT NULL, Select_priv enum('N','Y') DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL, Reload_priv enum('N','Y') DEFAULT 'N' NOT NULL, Shutdown_priv enum('N','Y') DEFAULT 'N' NOT NULL, Process_priv enum('N','Y') DEFAULT 'N' NOT NULL, File_priv enum('N','Y') DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') DEFAULT 'N' NOT NULL, References_priv enum('N','Y') DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL, Show_db_priv enum('N','Y') DEFAULT 'N' NOT NULL, Super_priv enum('N','Y') DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL, Execute_priv enum('N','Y') DEFAULT 'N' NOT NULL, Repl_slave_priv enum('N','Y') DEFAULT 'N' NOT NULL, Repl_client_priv enum('N','Y') DEFAULT 'N' NOT NULL, ssl_type enum('','ANY','X509', 'SPECIFIED') DEFAULT '' NOT NULL, ssl_cipher BLOB NOT NULL, x509_issuer BLOB NOT NULL, x509_subject BLOB NOT NULL, max_questions int(11) unsigned DEFAULT 0 NOT NULL, max_updates int(11) unsigned DEFAULT 0 NOT NULL, max_connections int(11) unsigned DEFAULT 0 NOT NULL, PRIMARY KEY Host (Host,User)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Users and global privileges';



INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);

INSERT INTO user VALUES ('','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);



INSERT INTO user (host,user) values ('localhost','');

INSERT INTO user (host,user) values ('','');



CREATE TABLE func (name char(64) binary DEFAULT '' NOT NULL, ret tinyint(1) DEFAULT '0' NOT NULL, dl char(128) DEFAULT '' NOT NULL, type enum ('function','aggregate') NOT NULL, PRIMARY KEY (name)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin  comment='User defined functions';



CREATE TABLE tables_priv (Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Timestamp timestamp(14), Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') DEFAULT '' NOT NULL, Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name), KEY Grantor (Grantor)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Table privileges';



CREATE TABLE columns_priv (Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Column_name char(64) binary DEFAULT '' NOT NULL, Timestamp timestamp(14), Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name,Column_name)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin  comment='Column privileges';



CREATE TABLE help_topic (help_topic_id int unsigned NOT NULL, name varchar(64) NOT NULL, help_category_id smallint unsigned NOT NULL, description text NOT NULL, example text NOT NULL, url varchar(128) NOT NULL, primary key (help_topic_id), unique index (name)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin  comment='help topics';

CREATE TABLE help_category (help_category_id smallint unsigned NOT NULL, name varchar(64) NOT NULL, parent_category_id smallint unsigned null, url varchar(128) NOT NULL, primary key (help_category_id), unique index (name)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin  comment='help categories';

CREATE TABLE help_keyword (help_keyword_id int unsigned NOT NULL, name varchar(64) NOT NULL, primary key  (help_keyword_id), unique index (name)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin  comment='help keywords';

CREATE TABLE help_relation (help_topic_id int unsigned NOT NULL references help_topic, help_keyword_id  int unsigned NOT NULL references help_keyword, primary key (help_keyword_id, help_topic_id)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin  comment='keyword-topic relation';



CREATE TABLE time_zone_name (Name char(64) NOT NULL,Time_zone_id int unsigned NOT NULL,PRIMARY KEY Name (Name)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin  comment='Time zone names';



CREATE TABLE time_zone (Time_zone_id int unsigned NOT NULL auto_increment, Use_leap_seconds enum('Y','N') DEFAULT 'N' NOT NULL,PRIMARY KEY TzId (Time_zone_id)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin  comment='Time zones';

CREATE TABLE time_zone_transition (Time_zone_id int unsigned NOT NULL,Transition_time bigint signed NOT NULL,Transition_type_id int unsigned NOT NULL,PRIMARY KEY TzIdTranTime (Time_zone_id, Transition_time)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin  comment='Time zone transitions';



CREATE TABLE time_zone_transition_type (Time_zone_id int unsigned NOT NULL,Transition_type_id int unsigned NOT NULL,Offset int signed DEFAULT 0 NOT NULL,Is_DST tinyint unsigned DEFAULT 0 NOT NULL,Abbreviation char(8) DEFAULT '' NOT NULL,PRIMARY KEY TzIdTrTId (Time_zone_id, Transition_type_id)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin  comment='Time zone transition types';

CREATE TABLE time_zone_leap_second (Transition_time bigint signed NOT NULL,Correction int signed NOT NULL,PRIMARY KEY TranTime (Transition_time)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin  comment='Leap seconds information for time zones';