diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-10-08 23:20:19 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-10-08 23:20:19 +0300 |
| commit | d378b1e3e388f3f6783af09df96a829d7b73f5ab (patch) | |
| tree | e7d13849a1d92edeaacd31753856f5a8cb389781 /scripts | |
| parent | 695b9bf7b1aed01f58be3aeb6ddebc546133a4cd (diff) | |
| download | mariadb-git-d378b1e3e388f3f6783af09df96a829d7b73f5ab.tar.gz | |
Portability fixes + a couple of bug fixes introduced by last push.
Docs/manual.texi:
Removed wrong web links
include/mysql_com.h:
Portability fix
libmysqld/Makefile.am:
Fix 'make dist'
mysys/mf_dirname.c:
Bugfix for last push
scripts/explain_log.sh:
Nicer output
scripts/mysql_install_db.sh:
Removed warnings when using 'mysql_install_db'
sql/sql_parse.cc:
Ensure that thd->query_length is always set
sql/sql_show.cc:
cleanup
sql/sql_yacc.yy:
Fix bug in last push
vio/vio.c:
Merge with violite.cc
vio/viosocket.c:
Merge with violite.cc
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/explain_log.sh | 2 | ||||
| -rw-r--r-- | scripts/mysql_install_db.sh | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/scripts/explain_log.sh b/scripts/explain_log.sh index d7f6bb97b40..c4a4ef21568 100644 --- a/scripts/explain_log.sh +++ b/scripts/explain_log.sh @@ -279,7 +279,7 @@ sub RunQuery { if (defined $row->{$_}) { #if (($_ eq 'type' ) and ($row->{$_} eq 'ALL')) { if ($row->{type} eq 'ALL') { - push (@{$Param->{ALL}}, "$row->{$_} $_ $Param->{DB} $Param->{Query}"); + push (@{$Param->{ALL}}, "$Param->{Query}"); #print ">> $row->{$_} $_ $Param->{DB} $Param->{Query}\n"; } $Param->{IdxUseCount} ++; diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 9b0cfd4eb66..c99126cdf53 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -232,14 +232,14 @@ then c_u="$c_u )" c_u="$c_u comment='Users and global privileges';" - i_u="INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE',NULL,NULL,NULL); - INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE',NULL,NULL,NULL); + i_u="INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE','','',''); + INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE','','',''); - REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE',NULL,NULL,NULL); - REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE',NULL,NULL,NULL); + REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE','','',''); + REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE','','',''); - INSERT INTO user VALUES ('localhost','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N','NONE',NULL,NULL,NULL); - INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N','NONE',NULL,NULL,NULL);" + INSERT INTO user VALUES ('localhost','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N','NONE','','',''); + INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N','NONE','','','');" fi if test ! -f $mdata/func.frm |