mariadb/client
unknown fdc446d0c6 merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BUILD/FINISH.sh:
  Auto merged
BUILD/SETUP.sh:
  Auto merged
BUILD/compile-pentium-debug:
  Auto merged
acconfig.h:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
heap/hp_rfirst.c:
  Auto merged
heap/hp_rnext.c:
  Auto merged
include/my_sys.h:
  Auto merged
include/myisam.h:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
myisam/mi_write.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/select_found.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/select_found.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
mysys/mf_iocache2.c:
  Auto merged
mysys/my_vsnprintf.c:
  Auto merged
sql/convert.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
strings/Makefile.am:
  Auto merged
2002-04-13 15:34:39 +03:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
client_priv.h Merged in some changes made to MySQL clients by other 2002-04-03 13:33:25 +03:00
completion_hash.cc Update copyright 2001-12-06 14:10:51 +02:00
completion_hash.h Update copyright 2001-12-06 14:10:51 +02:00
connect_test.c Update copyright 2001-12-06 14:10:51 +02:00
errmsg.c Update copyright 2001-12-06 14:10:51 +02:00
get_password.c Update copyright 2001-12-06 14:10:51 +02:00
insert_test.c Update copyright 2001-12-06 14:10:51 +02:00
list_test.c Update copyright 2001-12-06 14:10:51 +02:00
Makefile.am Update to autoconf 2.52 2002-02-07 21:34:35 +02:00
my_readline.h Update copyright 2001-12-06 14:10:51 +02:00
mysql.cc merge 2002-04-13 15:34:39 +03:00
mysqladmin.c fixes to make it compile and pass the test suite again after the last 2002-04-04 21:36:24 -07:00
mysqlbinlog.cc Updated benchmarks 2001-12-18 05:34:00 +02:00
mysqlcheck.c Changed mysql, mysqladmin, mysqlshow, mysqldump, mysqlimport, 2002-04-02 20:29:53 +03:00
mysqldump.c merge 2002-04-13 15:34:39 +03:00
mysqlimport.c merge 2002-04-03 13:36:01 +03:00
mysqlmanager-pwgen.c Update copyright 2001-12-06 14:10:51 +02:00
mysqlmanagerc.c Update copyright 2001-12-06 14:10:51 +02:00
mysqlshow.c Changed mysql, mysqladmin, mysqlshow, mysqldump, mysqlimport, 2002-04-02 20:29:53 +03:00
mysqltest.c merge 2002-04-13 15:34:39 +03: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 Update copyright 2001-12-06 14:10:51 +02:00
showdb_test.c Update copyright 2001-12-06 14:10:51 +02:00
sql_string.cc Removed some default_charset_info 2002-03-14 22:10:56 +04:00
sql_string.h New ctype functions/macros to support many charsets at a time 2002-03-12 21:37:58 +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 Update copyright 2001-12-06 14:10:51 +02:00