List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:March 16 2007 7:56pm
Subject:bk commit into 5.0 tree (joerg:1.2485) BUG#20166
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-16 20:56:16+01:00, joerg@trift2. +9 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Build sql files for netware from the mysql_system_tables*.sq files
   - Fix comments about mysql_create_system_tables.sh
   - Use mysql_install_db.sh to create system tables for mysql_test-run-shell
   - Fix mysql-test-run.pl to also look in share/mysql for the msyql_system*.sql files
  
  Changeset coded today by Magnus Svensson, just the application to 5.0.38 is by Joerg Bruehe.

  BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023@stripped, 2007-03-16 20:47:21+01:00, joerg@trift2. +0 -0
    Delete: netware/init_db.sql

  BitKeeper/deleted/.del-test_db.sql@stripped, 2007-03-16 20:47:45+01:00, joerg@trift2. +0 -0
    Delete: netware/test_db.sql

  BitKeeper/etc/ignore@stripped, 2007-03-16 20:56:13+01:00, joerg@trift2. +2 -0
    Added netware/init_db.sql netware/test_db.sql to the ignore list

  mysql-test/install_test_db.sh@stripped, 2007-03-16 20:56:13+01:00, joerg@trift2. +8 -12
    Use mysql_install_db from install_test_db(which is used by mysql-test-run-shell)
    to install the system tables

  mysql-test/mysql-test-run.pl@stripped, 2007-03-16 20:56:13+01:00, joerg@trift2. +11 -3
    Look for the mysql_system_tables*.sql also in share/mysql

  netware/Makefile.am@stripped, 2007-03-16 20:56:13+01:00, joerg@trift2. +24 -4
    Build netware/init_db.sql and netware/test_db.sql from
    the sources in scripts/msyql_system_tables*.sql

  scripts/make_binary_distribution.sh@stripped, 2007-03-16 20:56:13+01:00, joerg@trift2. +0 -6
    netware/init_db.sql and netware/test_db.sql are now built by the Makefiles
    from the scripts/mysql_system_tables*.sql files

  sql/mysql_priv.h@stripped, 2007-03-16 20:56:13+01:00, joerg@trift2. +3 -2
    Update comment remindging to update the MySQL system table definitions
    when adding a new SQL_MODE

  sql/sql_acl.h@stripped, 2007-03-16 20:56:13+01:00, joerg@trift2. +1 -1
    Update comment reminding to update the MySQL System tables
    when changing the ACL defines

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joerg
# Host:	trift2.
# Root:	/MySQL/M50/clone-5.0

--- 1.38/mysql-test/install_test_db.sh	2007-01-11 09:19:27 +01:00
+++ 1.39/mysql-test/install_test_db.sh	2007-03-16 20:56:13 +01:00
@@ -22,7 +22,7 @@
   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 @@
   then
     execdir=../../sbin
     bindir=../../bin
-    scriptdir=../../bin
+    scriptdir=../bin
     libexecdir=../../libexec
   else
     execdir=../bin
@@ -43,7 +43,7 @@
   execdir=../sql
   bindir=../client
   fix_bin=.
-  scriptdir=../scripts
+  scriptdir=scripts
   libexecdir=../libexec
 fi
 
@@ -100,18 +100,14 @@
 basedir=..
 else
 basedir=.
-EXTRA_ARG="--language=../sql/share/english/ --character-sets-dir=../sql/share/charsets/"
+EXTRA_ARG="--windows"
 fi
 
-mysqld_boot="${MYSQLD_BOOTSTRAP-$mysqld}"
+INSTALL_CMD="$scriptdir/mysql_install_db --no-defaults $EXTRA_ARG --basedir=$basedir --datadir=mysql-test/$ldata --srcdir=."
+echo "running $INSTALL_CMD"
 
-mysqld_boot="$mysqld_boot --no-defaults --bootstrap --skip-grant-tables \
-    --basedir=$basedir --datadir=$ldata \
-    --skip-innodb --skip-ndbcluster --skip-bdb \
-    $EXTRA_ARG"
-echo "running $mysqld_boot"
-
-if $scriptdir/mysql_create_system_tables test $mdata $hostname | $mysqld_boot
+cd ..
+if $INSTALL_CMD
 then
     exit 0
 else

--- 1.122/scripts/make_binary_distribution.sh	2007-03-08 01:00:43 +01:00
+++ 1.123/scripts/make_binary_distribution.sh	2007-03-16 20:56:13 +01:00
@@ -298,12 +298,6 @@
 # Copy system dependent files
 #
 if [ $BASE_SYSTEM = "netware" ] ; then
-  echo "CREATE DATABASE mysql;" > $BASE/bin/init_db.sql
-  echo "CREATE DATABASE test;" >> $BASE/bin/init_db.sql
-  sh ./scripts/mysql_create_system_tables.sh real "" "%" 0 \
-      >> $BASE/bin/init_db.sql
-  sh ./scripts/mysql_create_system_tables.sh test "" "%" 0 \
-      > $BASE/bin/test_db.sql
   ./scripts/fill_help_tables < ./Docs/manual.texi >> ./netware/init_db.sql
 fi
 

--- 1.437/sql/mysql_priv.h	2007-03-08 18:29:58 +01:00
+++ 1.438/sql/mysql_priv.h	2007-03-16 20:56:13 +01:00
@@ -417,8 +417,9 @@
   updated (to store more bytes on disk).
 
   NOTE: When adding new SQL_MODE types, make sure to also add them to
-  ../scripts/mysql_create_system_tables.sh and
-  ../scripts/mysql_fix_privilege_tables.sql
+  the scripts used for creating the MySQL system tables
+  in scripts/mysql_system_tables.sql and scripts/mysql_system_tables_fix.sql
+
 */
 
 #define RAID_BLOCK_SIZE 1024

--- 1.52/sql/sql_acl.h	2006-12-30 21:02:07 +01:00
+++ 1.53/sql/sql_acl.h	2007-03-16 20:56:13 +01:00
@@ -43,7 +43,7 @@
   don't forget to update
   1. static struct show_privileges_st sys_privileges[]
   2. static const char *command_array[] and static uint command_lengths[]
-  3. mysql_create_system_tables.sh, mysql_fix_privilege_tables.sql
+  3. mysql_system_tables.sql and mysql_system_tables_fix.sql
   4. acl_init() or whatever - to define behaviour for old privilege tables
   5. sql_yacc.yy - for GRANT/REVOKE to work
 */

--- 1.208/mysql-test/mysql-test-run.pl	2007-03-08 14:55:38 +01:00
+++ 1.209/mysql-test/mysql-test-run.pl	2007-03-16 20:56:13 +01:00
@@ -1495,9 +1495,17 @@
   if (!$opt_extern)
   {
 
-  # Look for SQL scripts directory
-  $path_sql_dir= mtr_path_exists("$glob_basedir/share",
-				 "$glob_basedir/scripts");
+    # 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 ) {
       $exe_mysqlslap=    mtr_exe_exists("$path_client_bindir/mysqlslap");

--- 1.20/netware/Makefile.am	2006-12-02 06:06:19 +01:00
+++ 1.21/netware/Makefile.am	2007-03-16 20:56:13 +01:00
@@ -49,8 +49,8 @@
 	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
@@ -60,7 +60,7 @@
              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 \
@@ -73,7 +73,7 @@
 		mysqld_safe.c mysqld_safe.def mysqldump.def mysqlimport.def \
 		mysqlshow.def mysqltest.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 \
@@ -84,6 +84,26 @@
 		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

--- 1.243/BitKeeper/etc/ignore	2007-03-01 17:59:50 +01:00
+++ 1.244/BitKeeper/etc/ignore	2007-03-16 20:56:13 +01:00
@@ -1337,3 +1337,5 @@
 win/vs8cache.txt
 zlib/*.ds?
 zlib/*.vcproj
+netware/init_db.sql
+netware/test_db.sql
Thread
bk commit into 5.0 tree (joerg:1.2485) BUG#20166Joerg Bruehe16 Mar