mariadb/scripts
unknown 33a2716a85 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new


Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
extra/Makefile.am:
  Auto merged
include/Makefile.am:
  Auto merged
include/my_global.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/key.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/ndb/docs/Makefile.am:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
libmysqld/Makefile.am:
  Merged from 5.0 to 5.1.
sql/ha_berkeley.cc:
  Merged from 5.0 to 5.1.
sql/lex.h:
  Merged from 5.0 to 5.1.
sql/set_var.cc:
  Merged from 5.0 to 5.1.
sql/share/errmsg.txt:
  Merged from 5.0 to 5.1.
sql/sql_lex.h:
  Merged from 5.0 to 5.1.
sql/sql_show.cc:
  Merged from 5.0 to 5.1.
sql/sql_yacc.yy:
  Merged from 5.0 to 5.1.
2005-11-23 14:57:00 +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 scripts/make_binary_distribution.sh 2005-11-11 18:48:53 +01: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_src_distribution.sh Merge mysql.com:/home/my/mysql-5.0 2005-11-05 01:32:55 +02:00
Makefile.am Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 2005-11-23 14:57:00 +02:00
msql2mysql.sh Import changeset 2000-07-31 21:29:14 +02:00
mysql_config.sh mysql_config.sh: 2005-09-28 13:39:28 +02: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 WL#2575 - Fulltext: Parser plugin for FTS 2005-11-06 13:13:06 +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: 2001-12-24 14:55:47 +00:00
mysql_fix_privilege_tables.sh Make mysql_fix_privilege_tables.sh not dependent on the current directory. 2005-10-05 01:08:22 +04:00
mysql_fix_privilege_tables.sql Merge mysql.com:/home/mysql_src/mysql-5.0 2005-11-18 16:38:01 +01:00
mysql_install_db.sh Manual merge of fix for bug 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 Fix for Bug#12629, "mysqld_multi produces syntax error". 2005-09-30 14:02:31 +03:00
mysqld_safe-watch.sh Changed safe_mysqld -> mysqld_safe 2001-06-28 10:49:16 +03:00
mysqld_safe.sh Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-11-01 12:15:08 -08: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