mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 07:44:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/client
History
unknown 37b79d90d3 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


client/mysql.cc:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Auto merged
mysql-test/r/information_schema.result:
  manual merge
mysql-test/t/information_schema.test:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
  manual merge
storage/ndb/src/ndbapi/DictCache.cpp:
  manual merge
2006-05-16 10:37:40 +02:00
..
.cvsignore
client_priv.h Removed double enum value. 2006-05-16 01:12:12 +03:00
client_priv.h.rej Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 2006-05-09 20:50:29 +03:00
CMakeLists.txt performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1. 2006-05-11 11:29:08 -05:00
completion_hash.cc
completion_hash.h
get_password.c
Makefile.am Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
my_readline.h
mysql.cc Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 2006-05-16 10:37:40 +02:00
mysql_upgrade.c Win build fix 2006-05-02 08:59:49 +05:00
mysqladmin.cc Bug#17208 SSL: client does not verify server certificate 2006-04-18 17:58:27 +02:00
mysqlbinlog.cc Changes to make testsuite run in CMake build tree. 2006-02-10 13:29:01 +01:00
mysqlcheck.c Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 2006-02-17 08:33:47 -06:00
mysqldump.c Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 2006-05-12 08:45:22 +02:00
mysqlimport.c Fix after merge 5.0->5.1 2006-05-12 09:10:04 +02:00
mysqlshow.c Bug#17208 SSL: client does not verify server certificate 2006-04-18 17:58:27 +02:00
mysqlslap.c mysqlslap.c: 2006-04-28 10:44:08 -05:00
mysqltest.c Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 2006-05-12 08:45:22 +02: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