mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/scripts
History
unknown 97a3ff8e66 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/ndb/include/kernel/AttributeList.hpp:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/include/transporter/TransporterDefinitions.hpp:
  Auto merged
storage/ndb/include/util/SimpleProperties.hpp:
  Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.cpp:
  Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbLinHash.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-06-08 17:12:09 +02:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
fill_func_tables.sh Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even if 2005-03-22 21:52:01 +01: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 - make sure to include mysql-test/t/*.sql files in the binary distributions and when 2005-06-08 11:49:24 +02:00
make_sharedlib_distribution.sh - match shared library file name suffixes on Mac OS X (.dylib) 2004-07-23 12:44:09 +02:00
make_win_binary_distribution.sh mysql-test-run.pl: 2005-03-09 01:34:22 +01:00
make_win_src_distribution.sh make_win_src_distribution.sh: 2005-05-18 16:04:44 +02:00
Makefile.am Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-07 12:50:45 +02:00
msql2mysql.sh Import changeset 2000-07-31 21:29:14 +02:00
mysql_config.sh A fix for Bug#6273 "building fails on link": we should not use 2005-02-05 01:21:16 +03:00
mysql_convert_table_format.sh - fixed typo in scripts/mysql_convert_table_format.sh 2002-10-18 19:43:06 +02:00
mysql_create_system_tables.sh Bug#10246 - Parser: bad syntax for GRANT EXECUTE 2005-05-17 19:54:20 +01:00
mysql_explain_log.sh - applied patch to mysql_explain_log.sh provided by Dennis Haney 2003-06-11 13:40:20 +02:00
mysql_find_rows.sh Fix skipp -> skip once and for all. 2004-06-03 11:52:54 -05:00
mysql_fix_extensions.sh mysql_fix_extensions.sh tool copied from 4.0 tree (referenced in manual). 2002-05-16 10:13:42 +10:00
mysql_fix_privilege_tables.sh Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even if 2005-03-22 21:52:01 +01:00
mysql_fix_privilege_tables.sql Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-05-17 23:25:13 +02:00
mysql_install_db.sh Manual merge of fix for bug #9913 into 5.0 tree. 2005-05-09 16:21:57 +04:00
mysql_prepare_privilege_tables_for_5.sql a script that fixes anti-GRANT'ness of privilege tables. 2003-11-25 16:08:55 +01:00
mysql_secure_installation.sh added to mysql_secure_installation 2003-10-24 15:20:46 -04:00
mysql_setpermission.sh - Applied patch provided by Martin Mokrejs <mmokrejs@natur.cuni.cz> 2003-04-25 21:58:25 +02:00
mysql_zap.sh Minor tweaks to help message of obscure script. 2004-04-04 18:48:41 -05:00
mysqlaccess.conf configure fixes 2000-09-14 15:10:06 +03:00
mysqlaccess.sh Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0 2005-01-13 11:12:00 +01:00
mysqlbug.sh merge with 3.23 2004-03-25 22:05:09 +02:00
mysqld_multi.sh Added a check for config-file. 2005-04-26 17:57:14 +03:00
mysqld_safe-watch.sh Changed safe_mysqld -> mysqld_safe 2001-06-28 10:49:16 +03:00
mysqld_safe.sh scripts/mysqld_safe.sh 2005-05-27 12:44:06 +12:00
mysqldumpslow.sh mysqldumpslow.sh: 2005-03-09 15:00:40 +01:00
mysqlhotcopy.sh BUG#7967 Fix mysqlhotcopy --record-log-position 2005-06-06 22:17:16 -04:00