mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/scripts
History
unknown 9a10c20ba9 Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/archive.result:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/delayed.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/queues.c:
  Auto merged
sql/events.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.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/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  manual merge
mysql-test/r/myisam.result:
  manual merge
mysql-test/r/partition.result:
  manual merge
mysql-test/r/user_var.result:
  manual merge
mysql-test/t/myisam.test:
  manual merge
mysql-test/t/partition.test:
  manual merge
mysql-test/t/user_var.test:
  manual merge
sql/item.h:
  manual merge
sql/item_func.cc:
  manual merge
storage/myisammrg/ha_myisammrg.cc:
  manual merge
2007-12-13 15:56:04 +04:00
..
.cvsignore
CMakeLists.txt
comp_sql.c
fill_help_tables.sql
make_binary_distribution.sh
make_sharedlib_distribution.sh
make_win_bin_dist Merge polly.(none):/home/kaa/src/opt/bug32221/my50-bug31445 2007-11-22 17:17:32 +03:00
Makefile.am Merge trift2.:/MySQL/M51/bug31644-5.1 2007-10-19 19:22:27 +02:00
msql2mysql.sh
mysql_config.sh
mysql_convert_table_format.sh
mysql_find_rows.sh
mysql_fix_extensions.sh
mysql_fix_privilege_tables.sh
mysql_install_db.sh after-merge fix 2007-12-10 12:21:02 +01:00
mysql_secure_installation.sh
mysql_setpermission.sh
mysql_system_tables.sql Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines 2007-10-19 13:06:37 -07:00
mysql_system_tables_data.sql Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 2007-12-10 12:16:41 +01:00
mysql_system_tables_fix.sql Fix for BUG#24923: Functions with ENUM issues. 2007-10-17 12:13:56 +04:00
mysql_test_data_timezone.sql
mysql_zap.sh
mysqlaccess.conf
mysqlaccess.sh
mysqlbug.sh Modify "mysqlbug" ("scripts/mysqlbug.sh") so that it differs between the original 2007-10-18 12:03:30 +02:00
mysqld_multi.sh
mysqld_safe.sh
mysqldumpslow.sh
mysqlhotcopy.sh