mariadb/client
unknown ee37c3a3a5 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/push-5.1


BitKeeper/deleted/.del-CMakeLists.txt~2eb9019b:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~86a68ea1:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~99a50df6:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~ef945345:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~fdec1f01:
  Auto merged
dbug/CMakeLists.txt:
  Auto merged
tests/CMakeLists.txt:
  Auto merged
zlib/CMakeLists.txt:
  Auto merged
client/CMakeLists.txt:
  Will be re-applied using "patch".
libmysql/CMakeLists.txt:
  Will be re-applied using "patch".
mysys/CMakeLists.txt:
  Will be re-applied using "patch".
sql/CMakeLists.txt:
  Will be re-applied using "patch".
2007-08-02 21:18:24 +02:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
client_priv.h Added a test for pre-statement call, and fixed connection/deconnect code so that the rest of bbench can be ran by others. 2007-06-15 17:22:57 -07:00
CMakeLists.txt Makefile.am: 2007-08-02 15:37:33 +02:00
completion_hash.cc WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03: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 WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
mysql.cc Merge magare.gmz:/home/kgeorge/mysql/autopush/B29325-5.0-opt 2007-07-11 12:44:49 +03:00
mysql_upgrade.c WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
mysqladmin.cc WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
mysqlbinlog.cc Makefile.am: 2007-08-02 15:37:33 +02:00
mysqlcheck.c WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
mysqldump.c Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-07-27 12:22:00 -06:00
mysqlimport.c WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
mysqlshow.c WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
mysqlslap.c Added a test for pre-statement call, and fixed connection/deconnect code so that the rest of bbench can be ran by others. 2007-06-15 17:22:57 -07:00
mysqltest.c Merge damien-katzs-computer.local:/Users/dkatz/50 2007-07-13 01:56:57 -04:00
readline.cc WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
sql_string.cc WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
sql_string.h Fixed compiler warnings 2007-02-23 13:13:55 +02:00