mariadb/client
unknown 88ef95ff4e Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main


client/mysql.cc:
  Auto merged
myisam/mi_delete.c:
  Auto merged
mysql-test/r/fulltext2.result:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-12-28 00:57:18 +11:00
..
.cvsignore
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 Additional "make distcheck" changes specific to 5.0 2005-11-09 11:56:04 +02:00
my_readline.h mysql.cc: 2004-05-05 22:47:09 +02:00
mysql.cc Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main 2005-12-28 00:57:18 +11:00
mysqladmin.cc Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-12-04 15:34:47 +02:00
mysqlbinlog.cc Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-12-04 15:34:47 +02:00
mysqlcheck.c Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-12-04 15:34:47 +02:00
mysqldump.c Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-12-04 15:34:47 +02:00
mysqlimport.c Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-12-04 15:34:47 +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.0 2005-12-04 15:34:47 +02:00
mysqltest.c mysqltest.c: 2005-12-12 12:15:25 -06: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