summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-01-26 01:19:47 +0200
committerunknown <monty@hundin.mysql.fi>2002-01-26 01:19:47 +0200
commit48ff048f8f2235508eb0579975611a805b34e24c (patch)
tree5ccc31c365805428193f80c2e7fe45e9c87a8173 /scripts
parenta1014a4f3a9f76fe0bcfae785bd72ef9a77e4821 (diff)
downloadmariadb-git-48ff048f8f2235508eb0579975611a805b34e24c.tar.gz
Update needed for SuSE 7.3
Update for autoconf 2.52 BitKeeper/deleted/.del-compile-pentium-symbols~b1b0f0b465eb15b8: Delete: BUILD/compile-pentium-symbols BUILD/Makefile.am: Remove not used scripts BUILD/SETUP.sh: Update needed for SuSE 7.3 BUILD/compile-alpha: Update needed for SuSE 7.3 BUILD/compile-pentium-debug-no-bdb: Update needed for SuSE 7.3 BUILD/compile-pentium-gcov: Update needed for SuSE 7.3 BUILD/compile-pentium-gprof: Update needed for SuSE 7.3 BUILD/compile-pentium-mysqlfs-debug: Update needed for SuSE 7.3 BUILD/compile-pentium: Update needed for SuSE 7.3 Docs/manual.texi: changelog Docs/mysqld_error.txt: New error messages. acconfig.h: Update to autoconf 2.52 acinclude.m4: Update to autoconf 2.52 bdb/dist/configure.in: Update to autoconf 2.52 configure.in: Update to autoconf 2.52 myisam/mi_check.c: Fix for myisamchk bug when reparing table with many keys. myisam/mi_key.c: Fix problem with NAN in key's scripts/Makefile.am: Fix for autoconf 2.52 scripts/mysql_new_fix_privilege_tables.sh: cleanup
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.am2
-rw-r--r--scripts/mysql_new_fix_privilege_tables.sh7
2 files changed, 5 insertions, 4 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 7ac554cda1d..1c3b8083347 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -76,7 +76,7 @@ CLEANFILES = @server_scripts@ \
SUPERCLEANFILES = mysqlbug
# We want the right version and configure comand line in mysqlbug
-mysqlbug: ${top_builddir}/config.status ${top_builddir}/config.cache mysqlbug.sh
+mysqlbug: ${top_builddir}/config.status mysqlbug.sh
SUFFIXES = .sh
diff --git a/scripts/mysql_new_fix_privilege_tables.sh b/scripts/mysql_new_fix_privilege_tables.sh
index 71c6de4ffd1..ce10ed0b412 100644
--- a/scripts/mysql_new_fix_privilege_tables.sh
+++ b/scripts/mysql_new_fix_privilege_tables.sh
@@ -17,8 +17,9 @@ echo ""
echo "If your tables are already up to date or partially up to date you will"
echo "get some warnings about 'Duplicated column name'. You can safely ignore these!"
+# Add fields that can be used to limit number of questions and connections
+# for some users.
+
@bindir@/mysql -f --user=root --password="$root_password" --host="$host" mysql <<END_OF_DATA
-alter table user add max_questions int(11) unsigned DEFAULT 0 NOT NULL;
-alter table user add max_updates int(11) unsigned DEFAULT 0 NOT NULL;
-alter table user add max_connections int(11) unsigned DEFAULT 0 NOT NULL;
+alter table user add max_questions int(11) NOT NULL, add max_updates int(11) unsigned NOT NULL, add max_connections int(11) unsigned NOT NULL;
END_OF_DATA