unknown 9f7548ae36 Merge mysql.com:/home/jimw/my/tmp_merge ...

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/r/user_var.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Resolve conflict
mysql-test/ndb/ndbcluster.sh:
  Resolve conflict
sql/set_var.cc:
  Resolve conflict
sql/share/errmsg.txt:
  Resolve conflict

2006-04-30 09:43:26 -07:00

..

charsets

Merge mysql.com:/usr/home/bar/mysql-5.0

2006-04-05 19:00:02 +05:00

.cvsignore

…

errmsg.txt

Merge mysql.com:/home/jimw/my/tmp_merge

2006-04-30 09:43:26 -07:00

Makefile.am

Additional "make distcheck" changes specific to 5.0

2005-11-09 11:56:04 +02:00