mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
27262 commits 2784 branches 343 tags 1.6 GiB
Commit graph

4 commits

Author SHA1 Message Date
unknown
7f6f31ae73 Merge mysql.com:/home/kostja/mysql/mysql-4.1-root 
into  mysql.com:/home/kostja/mysql/mysql-5.0-merge


client/mysqltest.c:
  Auto merged
mysql-test/r/rpl_log.result:
  Auto merged
mysql-test/r/rpl_rotate_logs.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/timezone_grant.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/timezone_grant.test:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
configure.in:
  Manual merge
mysql-test/r/olap.result:
  Manual merge
mysql-test/t/olap.test:
  Manual merge
mysql-test/t/select.test:
  Manual merge
sql/mysqld.cc:
  Manual merge
sql/sql_parse.cc:
  Manual merge
 2005-07-19 00:55:37 +04:00
unknown
9a27672396 Fix spurious permissions problem when CONVERT_TZ() is used 
in a multi-table update query. (Bug #9979)


mysql-test/r/timezone_grant.result:
  Add new results
mysql-test/t/timezone_grant.test:
  Add new test
sql/sql_parse.cc:
  Make sure to check lex->time_zone_tables_used to determine if
  we are using additional tables.
 2005-06-17 08:56:04 -07:00
unknown
754874fd00 Fix merge of tests that were split out of other test files 
mysql-test/r/ctype_ucs_binlog.result:
  Update results
mysql-test/r/timezone_grant.result:
  Update results
mysql-test/r/user_var-binlog.result:
  Update results
mysql-test/t/ctype_ucs_binlog.test:
  Update binlog starting position
mysql-test/t/timezone_grant.test:
  Update error numbers
mysql-test/t/user_var-binlog.test:
  Update binlog starting position
 2005-04-04 16:34:24 -07:00
unknown
57221d3d08 Eliminate most of the remaining hardcoded list of tests to skip 
by adding check for embedded server within tests and splitting some
tests into multiple test files.


mysql-test/mysql-test-run.sh:
  Remove most of hardcoded list of tests to skip
mysql-test/r/ps_1general.result:
  Update results
mysql-test/r/timezone2.result:
  Update results
mysql-test/r/user_var.result:
  Update results
mysql-test/r/variables.result:
  Update results
mysql-test/t/mix_innodb_myisam_binlog.test:
  Disable test with embedded server
mysql-test/t/mysql_protocols.test:
  Disable test with embedded server
mysql-test/t/mysqlbinlog.test:
  Disable test with embedded server
mysql-test/t/mysqlbinlog2.test:
  Disable test with embedded server
mysql-test/t/mysqldump.test:
  Disable test with embedded server
mysql-test/t/packet.test:
  Disable test with embedded server
mysql-test/t/ps_1general.test:
  Move parts of test to new ps_grant
mysql-test/t/rename.test:
  Disable test with embedded server
mysql-test/t/show_check.test:
  Disable test with embedded server
mysql-test/t/system_mysql_db_fix.test:
  Disable test with embedded server
mysql-test/t/timezone2.test:
  Move part of test to timezone_grant
mysql-test/t/user_var.test:
  Move part of test to new user_var-binlog
mysql-test/t/variables.test:
  Move part of test to rpl_variables
 2005-03-29 17:17:46 -08:00