database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-07 06:01:31 +03:00
Code Activity

Cleanup after last merge

Browse Source 
client/mysqltest.c:
  Don't write error message to log if there is more than one possible error message
include/mysqld_error.h:
  Made error messages more general
libmysqld/Makefile.am:
  md5 is now in mysys
mysql-test/include/have_isam.inc:
  Update to new result format
mysql-test/include/not_embedded.inc:
  Update to new result format
mysql-test/mysql-test-run.sh:
  Update to new result format
mysql-test/r/auto_increment.result:
  Update to new result format
mysql-test/r/count_distinct2.result:
  Update to new result format
mysql-test/r/create.result:
  Update to new result format
mysql-test/r/func_system.result:
  Update to new result format
mysql-test/r/isam.result:
  Update to new result format
mysql-test/r/lock.result:
  Update to new result format
mysql-test/r/lock_multi.result:
  Update to new result format
mysql-test/r/rename.result:
  Update to new result format
mysql-test/r/rpl000001.result:
  Fix wrong test
mysql-test/r/tablelock.result:
  Update to new result format
mysql-test/t/rename.test:
  Update to new result format
sql/share/czech/errmsg.txt:
  Made error messages more general
sql/share/danish/errmsg.txt:
  Made error messages more general
sql/share/dutch/errmsg.txt:
  Made error messages more general
sql/share/english/errmsg.txt:
  Made error messages more general
sql/share/estonian/errmsg.txt:
  Made error messages more general
sql/share/french/errmsg.txt:
  Made error messages more general
sql/share/german/errmsg.txt:
  Made error messages more general
sql/share/greek/errmsg.txt:
  Made error messages more general
sql/share/hungarian/errmsg.txt:
  Made error messages more general
sql/share/italian/errmsg.txt:
  Made error messages more general
sql/share/japanese/errmsg.txt:
  Made error messages more general
sql/share/korean/errmsg.txt:
  Made error messages more general
sql/share/norwegian-ny/errmsg.txt:
  Made error messages more general
sql/share/norwegian/errmsg.txt:
  Made error messages more general
sql/share/polish/errmsg.txt:
  Made error messages more general
sql/share/portuguese/errmsg.txt:
  Made error messages more general
sql/share/romanian/errmsg.txt:
  Made error messages more general
sql/share/russian/errmsg.txt:
  Made error messages more general
sql/share/slovak/errmsg.txt:
  Made error messages more general
sql/share/spanish/errmsg.txt:
  Made error messages more general
sql/share/swedish/errmsg.txt:
  Made error messages more general
sql/share/ukrainian/errmsg.txt:
  Made error messages more general
sql/sql_lex.cc:
  We can't remove lex->thd because sql_yacc uses it.
sql/sql_lex.h:
  We can't remove lex->thd because sql_yacc uses it.
sql/sql_yacc.yy:
  Cleanup
support-files/mysql.spec.sh:
  Create MySQL-embedded rpm
tools/mysqlmanager.c:
  Fix bug in merge
This commit is contained in:
unknown
2001-10-08 07:24:04 +03:00
parent 515c747dcf
commit 2ee21c9c46
44 changed files with 163 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/mysql-test-run.sh
View File

@ -124,7 +124,7 @@ MASTER_RUNNING=0
MASTER_MYPORT=9306
SLAVE_RUNNING=0
SLAVE_MYPORT=9307
MYSQL_MANAGER_PORT=23546
MYSQL_MANAGER_PORT=9308
MYSQL_MANAGER_PW_FILE=$MYSQL_TEST_DIR/var/tmp/manager.pwd
MYSQL_MANAGER_LOG=$MYSQL_TEST_DIR/var/log/manager.log
MYSQL_MANAGER_USER=root
@ -152,6 +152,7 @@ while test $# -gt 0; do
--tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;;
--master_port=*) MASTER_MYPORT=`$ECHO "$1" | $SED -e "s;--master_port=;;"` ;;
--slave_port=*) SLAVE_MYPORT=`$ECHO "$1" | $SED -e "s;--slave_port=;;"` ;;
--manager-port=*) MYSQL_MANAGER_PORT=`$ECHO "$1" | $SED -e "s;--manager_port=;;"` ;;
--with-openssl)
EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT \
--ssl-ca=$BASEDIR/SSL/cacert.pem \