mariadb/libmysqld
unknown 7edc2cf05d Post-merge post-merge fix (new error codes for fparser).
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
libmysqld/Makefile.am:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
2004-05-14 16:10:31 +02:00
..
examples - added missing link line that seemed to have gone lost during the last 2003-10-08 13:06:47 +02:00
copyright Added all changes from old 4.0 version: 2001-04-11 13:04:03 +02:00
emb_qcache.cc Fixed many compiler warnings 2004-04-05 13:56:05 +03:00
emb_qcache.h SCRUM 2003-12-01 17:19:10 +04:00
embedded_priv.h Fix for 1224 (USER() CURRENT_USER() functions in embedded library) 2004-01-07 21:30:15 +04:00
lib_sql.cc Fixed many compiler warnings 2004-04-05 13:56:05 +03:00
libmysqld.c Fix for 1224 (USER() CURRENT_USER() functions in embedded library) 2004-01-07 21:30:15 +04:00
libmysqld.def Fixed some new memory leaks 2003-06-24 12:10:35 +03:00
Makefile.am Post-merge post-merge fix (new error codes for fparser). 2004-05-14 16:10:31 +02:00