• unknown's avatar
    WL #3670: Compile-time option to remove GRANT-related startup options · c2e9a4af
    unknown authored
    - configure --disable-grant-options defines DISABLE_GRANT_OPTIONS
    - configure.js/cmake also updated
    - if DISABLE_GRANT_OPTIONS is defined, mysqld no longer recognizes:
      --bootstrap
      --init-file
      --skip-grant-tables
    
    Scripts which rely on those three options are modified to check the environment for MYSQLD_BOOTSTRAP; it should be set to the full path of a mysqld which does handle those options.
    
    For example:
    
    $ export MYSQLD_BOOTSTRAP
    $ MYSQLD_BOOTSTRAP=/path/to/full/MySQL/bin/mysqld
    $ mysql_install_db
    $ make test
    
    
    configure.in:
      WL#3670
      
      Add --disable-grant-options
    mysql-test/install_test_db.sh:
      Add MYSQLD_BOOTSTRAP env variable, to enable test suite to work even if mysqld does not accept --bootstrap or --skip-grant-tables.
    mysql-test/mysql-test-run.pl:
      Add MYSQLD_BOOTSTRAP env variable, to enable test suite to work even if mysqld does not accept --bootstrap or --skip-grant-tables.
    mysql-test/mysql_test_run_new.c:
      Mention need for MYSQLD_BOOTSTRAP in a comment, in case this needs to be used with a mysqld which does not accept the --bootstrap option.
    scripts/mysql_install_db.sh:
      Add MYSQLD_BOOTSTRAP env variable, to enable mysqld_install_db to work even if mysqld does not accept --bootstrap or --skip-grant-tables.
    sql/CMakeLists.txt:
      Add DISABLE_GRANT_OPTIONS define
    sql/mysqld.cc:
      Add DISABLE_GRANT_OPTIONS define, which removes the --bootstrap, --init-file, and --skip-grant-tables options
    win/README:
      Document the DISABLE_GRANT_OPTIONS define
    win/configure.js:
      Handle DISABLE_GRANT_OPTIONS
    c2e9a4af
mysqld.cc 274 KB