mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/scripts
History
unknown d0dad4bf38 Merge rurik.mysql.com:/home/igor/tmp_merge 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


BitKeeper/deleted/.del-generate_prefix_files.pl:
  Delete: extra/yassl/include/openssl/generate_prefix_files.pl
BitKeeper/deleted/.del-prefix_crypto.h:
  Delete: extra/yassl/include/openssl/prefix_crypto.h
BitKeeper/deleted/.del-prefix_ssl.h:
  Delete: extra/yassl/include/openssl/prefix_ssl.h
BitKeeper/deleted/.del-Makefile.am~abb265028eb9b6a7:
  Auto merged
BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
  Auto merged
BitKeeper/deleted/.del-yassl.m4~e55e55c1e863abaf:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/yassl/include/openssl/crypto.h:
  Auto merged
extra/yassl/include/openssl/ssl.h:
  Auto merged
extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/src/Makefile.am:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
extra/yassl/src/template_instnt.cpp:
  Auto merged
extra/yassl/src/yassl_int.cpp:
  Auto merged
extra/yassl/testsuite/Makefile.am:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
include/violite.h:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/include/common-tests.inc:
  Auto merged
mysql-test/r/analyze.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/key_cache.result:
  Auto merged
mysql-test/r/preload.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/analyze.test:
  Auto merged
mysql-test/t/explain.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
vio/Makefile.am:
  Auto merged
client/Makefile.am:
  Manual merge
libmysqld/Makefile.am:
  Manual merge
mysql-test/r/compress.result:
  Manual merge
mysql-test/r/explain.result:
  Manual merge
mysql-test/r/select.result:
  Manual merge
mysql-test/r/view.result:
  Manual merge
mysql-test/t/select.test:
  Manual merge
mysql-test/t/view.test:
  Manual merge
sql/sql_base.cc:
  Manual merge
sql/sql_parse.cc:
  Manual merge
2006-06-09 00:23:59 -07:00
..
.cvsignore
fill_func_tables.sh This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work. 2006-02-12 13:26:30 -08:00
fill_help_tables.sh - added copyright header on top of the fill_help_tables.sql file (BUG#5772) 2005-02-09 17:40:10 +01:00
fill_help_tables.sql More changes to reflect the removal of manual.texi from the sources: 2005-04-13 18:29:23 +02:00
make_binary_distribution.sh Removing mysql_explain_log from 5.1 2006-05-23 17:26:56 -07:00
make_sharedlib_distribution.sh make_sharedlib_distribution.sh: 2006-05-23 00:50:39 +02:00
make_win_src_distribution.sh Merge rurik.mysql.com:/home/igor/tmp_merge 2006-06-09 00:23:59 -07:00
Makefile.am Removing mysql_explain_log from 5.1 2006-05-23 17:26:56 -07:00
msql2mysql.sh
mysql_config.sh mysql_config.sh: 2006-03-29 14:59:53 +02:00
mysql_convert_table_format.sh This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work. 2006-02-12 13:26:30 -08:00
mysql_create_system_tables.sh Merge from 5.0 to 5.1. Third part with fixes. 2006-05-31 14:55:28 +03:00
mysql_find_rows.sh
mysql_fix_extensions.sh
mysql_fix_privilege_tables.sh fix for bug #16400 2006-02-24 00:29:50 +01:00
mysql_fix_privilege_tables.sql Fix for bug #17394 - Events namespace is wrong 2006-05-29 10:39:45 +02:00
mysql_install_db.sh Remove sql-bench from the server repository -- it is being maintained 2006-04-13 10:34:46 -07:00
mysql_secure_installation.sh
mysql_setpermission.sh
mysql_zap.sh
mysqlaccess.conf
mysqlaccess.sh Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0 2005-01-13 11:12:00 +01:00
mysqlbug.sh
mysqld_multi.sh Manual merge of the fix for bug#16106. 2006-01-16 16:48:05 +01:00
mysqld_safe.sh Bug #6061 mysql-log-rotate script - error logging doesn't use new file 2006-05-10 11:33:36 -06:00
mysqldumpslow.sh mysqldumpslow.sh: 2005-03-09 15:00:40 +01:00
mysqlhotcopy.sh Don't try to mysqlhotcopy the INFORMATION_SCHEMA database. (Bug #14610) 2005-11-10 17:05:36 -08:00