Commit f0ac4a74 authored by unknown's avatar unknown

Merge stella.local:/home2/mydev/mysql-5.0-axmrg

into  stella.local:/home2/mydev/mysql-5.1-axmrg


client/mysql.cc:
  Auto merged
mysql-test/r/archive.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
mysql-test/t/ctype_uca.test:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge from 5.0
mysql-test/t/subselect.test:
  Manual merge from 5.0
parents 30aee30b 8a7f5a1d
No related merge requests found
......@@ -21,3 +21,4 @@ lowercase_table3 : Bug#32667 lowercase_table3.test reports to error log
kill : Bug#29149: Test "kill" fails on Windows
grant3 : Bug#32723: grant3.test fails
innodb_mysql : Bug#32724: innodb_mysql.test fails randomly
rpl_log_pos : Bug#8693 Test 'rpl_log_pos' fails sometimes
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment