mariadb/client
unknown fbd929f802 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel


mysys/my_pread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/heap/hp_write.c:
  Auto merged
mysql-test/t/mysqlbinlog2.test:
  SCCS merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
sql/event_db_repository.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2007-04-03 14:51:32 +03:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
client_priv.h Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2007-03-29 16:11:29 +02:00
CMakeLists.txt Fixes for 5.1-arch repository to compile on Windows. 2007-03-22 00:43:14 -07:00
completion_hash.cc Many files: 2006-12-23 20:17:15 +01:00
completion_hash.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
echo.c echo.c: 2007-03-20 18:31:49 +01:00
get_password.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
Makefile.am Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-03-31 00:17:12 +02:00
my_readline.h Many files: 2006-12-23 20:17:15 +01:00
mysql.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2007-04-03 13:51:31 +02:00
mysql_upgrade.c Fix bad merge of mysql_upgrade.c; return to version 1.27 of the file, as after fix for bug 25074 2007-03-08 07:55:03 +01:00
mysqladmin.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 2007-03-24 11:06:09 +02:00
mysqlbinlog.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 2007-04-03 14:51:32 +03:00
mysqlcheck.c Added find_type_or_exit and find_bit_type_or_exit as wrappers 2007-03-19 11:19:51 +02:00
mysqldump.c Fixes for 4.1 to be as in 5.0 and above. 2007-03-27 18:51:02 +03:00
mysqlimport.c Added find_type_or_exit and find_bit_type_or_exit as wrappers 2007-03-19 11:19:51 +02:00
mysqlshow.c Added find_type_or_exit and find_bit_type_or_exit as wrappers 2007-03-19 11:19:51 +02:00
mysqlslap.c Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2007-03-29 16:11:29 +02:00
mysqltest.c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 2007-03-20 23:53:25 +01:00
readline.cc Many files: 2006-12-23 20:17:15 +01:00
sql_string.cc Fixed compiler warnings. 2007-03-22 20:32:07 +02:00
sql_string.h Fixed compiler warnings 2007-02-23 13:13:55 +02:00