mariadb/client
unknown 49b0312dd7 merge commit, hope that none of bar and dlenev changes were
lost.


BitKeeper/etc/logging_ok:
  auto-union
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
include/mysqld_error.h:
  merge commit: new error message added
sql-common/client.c:
  merge commit
sql/mysql_priv.h:
  merge commit: autoremerge
sql/set_var.h:
  merge commit
sql/share/czech/errmsg.txt:
  merge commit
sql/share/danish/errmsg.txt:
  merge commit
sql/share/dutch/errmsg.txt:
  merge commit
sql/share/english/errmsg.txt:
  merge commit
sql/share/estonian/errmsg.txt:
  merge commit
sql/share/french/errmsg.txt:
  merge commit
sql/share/german/errmsg.txt:
  merge commit
sql/share/greek/errmsg.txt:
  merge commit
sql/share/hungarian/errmsg.txt:
  merge commit
sql/share/italian/errmsg.txt:
  merge commit
sql/share/japanese/errmsg.txt:
  merge commit
sql/share/korean/errmsg.txt:
  merge commit
sql/share/norwegian-ny/errmsg.txt:
  merge commit
sql/share/norwegian/errmsg.txt:
  merge commit
sql/share/polish/errmsg.txt:
  merge commit
sql/share/portuguese/errmsg.txt:
  merge commit
sql/share/romanian/errmsg.txt:
  merge commit
sql/share/russian/errmsg.txt:
  merge commit
sql/share/serbian/errmsg.txt:
  merge commit
sql/share/slovak/errmsg.txt:
  merge commit
sql/share/spanish/errmsg.txt:
  merge commit
sql/share/swedish/errmsg.txt:
  merge commit
sql/share/ukrainian/errmsg.txt:
  merge commit
sql/slave.cc:
  merge commit
sql/slave.h:
  merge commit
sql/sql_acl.cc:
  merge commit
sql/sql_parse.cc:
  merge commit
sql/sql_repl.h:
  merge commit
2003-09-03 14:12:10 +04:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
client_priv.h Added --delimiter option to mysql 2003-04-23 03:29:03 +03:00
completion_hash.cc upgrade readline to version 4.3 2002-11-19 18:26:53 +04:00
completion_hash.h upgrade readline to version 4.3 2002-11-19 18:26:53 +04:00
get_password.c Merge with 4.0.14 2003-08-11 22:44:43 +03:00
Makefile.am changed processing of LOAD DATA in mysqlbinlog 2003-05-20 17:03:18 -04:00
my_readline.h Update copyright 2001-12-06 14:10:51 +02:00
mysql.cc After merge fixes 2003-08-19 00:08:08 +03:00
mysqladmin.c First version of new authentification procedure: now authentification is one-stage (instead of two-stage in 4.1) 2003-07-01 23:40:59 +04:00
mysqlbinlog.cc Merge with 4.0.14 2003-08-11 22:44:43 +03:00
mysqlcheck.c consistency fix - all help texts for command-line options should end with a dot. 2003-06-13 10:59:02 +02:00
mysqldump.c Fix for the bug #1125 mysqldump -X creates invalid XML 2003-08-28 19:27:46 +05:00
mysqlimport.c consistency fix - all help texts for command-line options should end with a dot. 2003-06-13 10:59:02 +02:00
mysqlmanager-pwgen.c consistency fix - all help texts for command-line options should end with a dot. 2003-06-13 10:59:02 +02:00
mysqlmanagerc.c Big code cleanup/review before 4.0.2 release. 2002-06-11 11:20:31 +03:00
mysqlshow.c consistency fix - all help texts for command-line options should end with a dot. 2003-06-13 10:59:02 +02:00
mysqltest.c After merge fixes 2003-08-19 00:08:08 +03:00
readline.cc Added macros for nice TIMESPEC usage. 2002-01-02 21:29:41 +02:00
sql_string.cc CHARSET_INFO structure reorganization for easier maintainance 2003-05-23 17:45:52 +05:00
sql_string.h Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol 2003-06-14 11:37:42 +03:00