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
Alexey Kopytov f10885675c Manual merge of mysql-trunk into mysql-trunk-merge. 
Conflicts:

Text conflict in client/mysqlbinlog.cc
Text conflict in mysql-test/Makefile.am
Text conflict in mysql-test/collections/default.daily
Text conflict in mysql-test/r/mysqlbinlog_row_innodb.result
Text conflict in mysql-test/suite/rpl/r/rpl_typeconv_innodb.result
Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
Text conflict in mysql-test/suite/rpl/t/rpl_row_create_table.test
Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test
Text conflict in mysql-test/suite/rpl/t/rpl_typeconv_innodb.test
Text conflict in mysys/charset.c
Text conflict in sql/field.cc
Text conflict in sql/field.h
Text conflict in sql/item.h
Text conflict in sql/item_func.cc
Text conflict in sql/log.cc
Text conflict in sql/log_event.cc
Text conflict in sql/log_event_old.cc
Text conflict in sql/mysqld.cc
Text conflict in sql/rpl_utility.cc
Text conflict in sql/rpl_utility.h
Text conflict in sql/set_var.cc
Text conflict in sql/share/Makefile.am
Text conflict in sql/sql_delete.cc
Text conflict in sql/sql_plugin.cc
Text conflict in sql/sql_select.cc
Text conflict in sql/sql_table.cc
Text conflict in storage/example/ha_example.h
Text conflict in storage/federated/ha_federated.cc
Text conflict in storage/myisammrg/ha_myisammrg.cc
Text conflict in storage/myisammrg/myrg_open.c
2010-03-24 18:03:44 +03:00
..
CMakeLists.txt Fix errors when building release 2010-03-19 18:33:48 +01:00
comp_sql.c Add "name of struct" as first arg to comp_sql 2007-04-23 14:01:48 +02:00
dheadgen.pl Some portability fixes. 2009-06-04 18:47:38 +02:00
fill_help_tables.sql
make_binary_distribution.sh make_binary_distribution.sh: fix path for installing the MALLOC_LIB (to $DEST/lib) 2009-09-29 21:11:41 +02:00
make_sharedlib_distribution.sh my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
make_win_bin_dist Fix errors when building release 2010-03-19 18:33:48 +01:00
Makefile.am Manual merge of mysql-trunk into mysql-trunk-merge. 2010-03-24 18:03:44 +03:00
msql2mysql.sh gen_lex_hash.cc: 2007-01-31 00:06:42 +01:00
mysql_config.pl.in This is the 5.4 version of the fix for bug#47007 2009-09-08 15:35:01 +02:00
mysql_config.sh Add --malloc-lib=LIB option to mysqld_safe to LD_PRELOAD a shared library for mysqld 2009-09-23 01:26:08 +02:00
mysql_convert_table_format.sh Add support for wildcards in mysql_convert_table_format, and add 2009-04-28 11:47:34 -07:00
mysql_find_rows.sh Use /usr/bin/perl as standard Perl install path (bug#44643) 2009-05-09 23:43:48 +02:00
mysql_fix_extensions.sh Use /usr/bin/perl as standard Perl install path (bug#44643) 2009-05-09 23:43:48 +02:00
mysql_install_db.pl.in make_win_bin_dist CMakeLists.txt resolveip.c Makefile.am: 2007-12-28 01:02:28 +01:00
mysql_install_db.sh Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-23 16:26:45 +03:00
mysql_secure_installation.pl.in Add a few comments to clarify do_query() return values in mysql_secure_installation.pl 2009-11-03 14:34:01 -07:00
mysql_secure_installation.sh Bug#48031: mysql_secure_installation -- bash bug regarding passwords with 2009-11-03 13:50:28 -07:00
mysql_setpermission.sh Merge up 5.0-build into 5.1-build: 2009-05-29 15:40:55 +02:00
mysql_system_tables.sql Bug#45194 mysql_upgrade deletes existing data in performance_schema database/schema 2010-03-05 08:31:01 -07:00
mysql_system_tables_data.sql Backport of WL#798 (MySQL IPv6 support) from 6.0. 2009-11-25 13:53:23 +03:00
mysql_system_tables_fix.sql Manual merge of mysql-trunk into mysql-trunk-merge. 2010-03-24 18:03:44 +03:00
mysql_test_data_timezone.sql Bug#20166 mysql-test-run.pl does not test system privilege tables creation 2007-02-26 11:49:24 +01:00
mysql_zap.sh Merge up 5.0-build into 5.1-build: 2009-05-29 15:40:55 +02:00
mysqlaccess.conf
mysqlaccess.sh Use /usr/bin/perl as standard Perl install path (bug#44643) 2009-05-09 23:43:48 +02:00
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 Bug #51468: mysqld_multi is broken in 5.1.44 2010-02-26 14:49:13 +02:00
mysqld_safe.sh Bug #51938 plugin_dir gets bad default value 2010-03-14 21:11:19 +01:00
mysqldumpslow.sh Add explanation of the possible -s values for mysqldumpslow. (Bug #35663, 2009-05-07 10:40:00 -07:00
mysqlhotcopy.sh Bug#42465 mysqlhotcopy fails with "Table '<y>' was locked with a READ lock" error message. 2010-02-28 23:49:29 +04:00