mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/client
History
unknown 016fe413b4 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/r/mix_innodb_myisam_binlog.result:
  Resolve conflict
sql/item_func.cc:
  Resolve conflict
sql/sql_show.cc:
  Resolve conflicts
2005-11-17 13:37:30 -08:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
client_priv.h BUG# 13052 2005-10-12 22:44:42 -07:00
completion_hash.cc few harmless warnings from automated code-checking tools fixed 2005-01-08 21:25:31 +01: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 Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking 2005-10-18 15:43:59 +02:00
my_readline.h mysql.cc: 2004-05-05 22:47:09 +02:00
mysql.cc Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-11-17 13:37:30 -08:00
mysqladmin.cc Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 2005-08-26 15:56:52 +03:00
mysqlbinlog.cc Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 2005-10-19 19:42:14 +02:00
mysqlcheck.c Fix for bug#13783 mysqlcheck tries to optimize and analyze information_schema 2005-10-18 14:25:03 +05:00
mysqldump.c Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-10-28 14:26:22 -05:00
mysqlimport.c Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-31 11:54:36 +02:00
mysqlmanager-pwgen.c Merge with 4.0 2004-09-01 04:12:09 +03:00
mysqlmanagerc.c Added global my_getopt_error_reporter function pointer which is 2004-08-31 21:27:58 +05:00
mysqlshow.c Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 2005-08-26 15:56:52 +03:00
mysqltest.c Manually merged 2005-11-01 19:47:53 +03:00
readline.cc fixed conversion errors (Windows IA64 build) 2005-03-07 09:47:24 +01:00
sql_string.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
sql_string.h Bug#8610: The ucs2_turkish_ci collation fails with upper('i') 2005-06-06 16:54:15 +05:00