mariadb/client
unknown 26b6dc4291 Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
config/ac-macros/ha_ndbcluster.m4:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/rpl_timezone.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/rpl_injector.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.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_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/t/mysqldump.test:
  Manual merge
sql/log_event.cc:
  manual merge
2006-12-08 23:41:29 +01:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
client_priv.h Added --debug-info to most clients to detect memory leaks in mysql-test-run 2006-11-21 22:32:58 +02:00
CMakeLists.txt Add mysys/my_getpagesize as source file foir mysql_upgrade 2006-11-27 15:00:08 +01: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 This is an implementation of two WL items: 2006-05-18 18:57:50 +04:00
Makefile.am Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 2006-11-27 10:48:41 +01:00
my_readline.h mysql.cc: 2004-05-05 22:47:09 +02:00
mysql.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 2006-12-04 19:28:38 +01:00
mysql_upgrade.c Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 2006-11-29 15:44:09 +01:00
mysqladmin.cc Added --debug-info to most clients to detect memory leaks in mysql-test-run 2006-11-21 22:32:58 +02:00
mysqlbinlog.cc Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 2006-12-08 23:41:29 +01:00
mysqlcheck.c Added --debug-info to most clients to detect memory leaks in mysql-test-run 2006-11-21 22:32:58 +02:00
mysqldump.c Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 2006-12-01 21:12:13 +01:00
mysqlimport.c Added --debug-info to most clients to detect memory leaks in mysql-test-run 2006-11-21 22:32:58 +02:00
mysqlshow.c Added --debug-info to most clients to detect memory leaks in mysql-test-run 2006-11-21 22:32:58 +02:00
mysqlslap.c Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
mysqltest.c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 2006-12-06 23:45:09 +01:00
readline.cc Bug#19799 delimiter command not working correctly when sourcing a sql file 2006-11-21 21:10:02 -05: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