mariadb/client
unknown e9525947d4 Resolving merge conflicts
BitKeeper/etc/logging_ok:
  auto-union
include/mysql.h:
  Auto merged
sql/convert.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
libmysqld/lib_sql.cc:
  merging
sql/item_strfunc.cc:
  merging
2002-12-12 12:49:56 +04:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
client_priv.h Merge with 4.0 2002-11-21 15:56:48 +02: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
connect_test.c Correct bug which exposed itself in rpl000017 2002-11-29 21:34:13 +03:00
get_password.c Update copyright 2001-12-06 14:10:51 +02:00
insert_test.c Get rid of pbool from my_list.h; and avoid using the my_global.h for clients 2002-11-28 09:56:26 -08:00
list_test.c Update copyright 2001-12-06 14:10:51 +02:00
Makefile.am temporary fix to make mysql.cc to compile --with-readline 2002-11-26 15:33:30 +01:00
my_readline.h Update copyright 2001-12-06 14:10:51 +02:00
mysql.cc Fixed a bug in mysql 'use' command. 'use' can now take quoted arguments. 2002-12-11 16:03:50 +02:00
mysqladmin.c Basically minor code optimizations and cleanups 2002-12-05 03:55:29 +03:00
mysqlbinlog.cc Portability fix when using -DBIG_TABLES 2002-11-14 12:21:36 +02:00
mysqlcheck.c Merge with 4.0 2002-11-21 15:56:48 +02:00
mysqldump.c Merge with 4.0 2002-11-21 15:56:48 +02:00
mysqlimport.c Add shared memory protocol and option --protocol 2002-11-15 00:16:30 +05:00
mysqlmanager-pwgen.c Big code cleanup/review before 4.0.2 release. 2002-06-11 11:20:31 +03:00
mysqlmanagerc.c Big code cleanup/review before 4.0.2 release. 2002-06-11 11:20:31 +03:00
mysqlshow.c Merge with 4.0 2002-11-21 15:56:48 +02:00
mysqltest.c Pull conflicts resolutions 2002-11-29 12:35:48 +04:00
password.c Update copyright 2001-12-06 14:10:51 +02:00
readline.cc Added macros for nice TIMESPEC usage. 2002-01-02 21:29:41 +02:00
select_test.c Get rid of pbool from my_list.h; and avoid using the my_global.h for clients 2002-11-28 09:56:26 -08:00
showdb_test.c Update copyright 2001-12-06 14:10:51 +02:00
sql_string.cc Copy from /sql directory 2002-11-15 13:58:24 +04:00
sql_string.h Copy from /sql directory 2002-11-15 13:58:24 +04:00
ssl_test.c Update copyright 2001-12-06 14:10:51 +02:00
thimble.cc Update copyright 2001-12-06 14:10:51 +02:00
thread_test.c Added useful exit error code for programs using my_getopt in case 2002-05-29 15:07:30 +03:00