mariadb/client
unknown 72e0d8b40b Merge xiphis.org:/home/antony/work2/mysql-5.1-engines
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge


include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  manual change to new api
2007-05-04 23:35:14 -07:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
client_priv.h Move WEXITSTATUS #define from mysqltest.c to client_priv.h, and 2007-04-18 20:47:55 -06:00
CMakeLists.txt Bug#24732 Executables do not include Vista manifests 2007-04-23 16:23:32 -04: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 Manual merge: Makefile lines must start with tab, not blank. 2007-05-02 14:16:21 +02:00
my_readline.h Many files: 2006-12-23 20:17:15 +01:00
mysql.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 2007-04-27 19:09:39 +02:00
mysql_upgrade.c Use a temp variable "error" for storing return code of pclose 2007-04-23 13:27:55 +02: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 romeo.(none):/home/bkroot/mysql-5.1-rpl 2007-04-20 10:46:58 +02:00
mysqlcheck.c Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-10 16:28:47 +03:00
mysqldump.c Bug#27293: mysqldump crashes when dumping procedure defined by different user 2007-04-30 12:32:57 +02: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 bk-internal.mysql.com:/home/bk/mysql-5.1-engines 2007-04-27 19:09:39 +02: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