Commit graph

4 commits

Author SHA1 Message Date
unknown
6de3acece2 Merge mysql.com:/d2/hf/common/my41-common
into  mysql.com:/d2/hf/common/my50-common


mysql-test/t/mysqladmin.test:
  Auto merged
sql/item_func.cc:
  Auto merged
libmysqld/lib_sql.cc:
  merging
mysql-test/t/distinct.test:
  merging
sql/sql_prepare.cc:
  SCCS merged
2007-01-02 17:50:55 +04:00
unknown
4a12418583 embedded-server related fixes
libmysqld/lib_sql.cc:
  error message moved to 'stmt'
mysql-test/t/distinct.test:
  temporary disabled in embedded server
mysql-test/t/mysqladmin.test:
  disabled in embedded server
sql/sql_prepare.cc:
  superfluous #ifndef removed
2007-01-02 17:46:20 +04:00
unknown
c0efc71780 Adjust replace to mask win paths 2006-12-06 16:44:31 +01:00
unknown
fbd4378b85 Bug#10608 mysqladmin breaks on "database" variable in my.cnf
- Add printout of "Warning" or "Note" for non error messages in default_reporter
 - Add test for the above in new mysqladmin.test


mysql-test/mysql-test-run.pl:
  Add support for mysqladmin to mysql-test-run.pl
mysys/my_getopt.c:
  Add printout of Warning: or Info: in 'default_reporter', this
  will make the user aware of the problem but can filter it
  as a warning or note.
mysql-test/r/mysqladmin.result:
  New BitKeeper file ``mysql-test/r/mysqladmin.result''
mysql-test/t/mysqladmin.test:
  New BitKeeper file ``mysql-test/t/mysqladmin.test''
2006-11-10 13:25:10 +01:00