database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-05 08:04:25 +03:00
Code Activity
Files
fcaaee631792b51ce7ea12db1d5f5c2019d0fa3b
mariadb/scripts
History
unknown 6009980ff3 Merge mysql.com:/home/kent/bk/mysql-5.0-release-merge 
into  mysql.com:/home/kent/bk/mysql-5.1


BUILD/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/std_data/funcs_1/innodb_tb1.txt:
  Auto merged
mysql-test/std_data/funcs_1/innodb_tb2.txt:
  Auto merged
mysql-test/std_data/funcs_1/innodb_tb3.txt:
  Auto merged
mysql-test/std_data/funcs_1/innodb_tb4.txt:
  Auto merged
mysql-test/std_data/funcs_1/memory_tb1.txt:
  Auto merged
mysql-test/std_data/funcs_1/memory_tb2.txt:
  Auto merged
mysql-test/std_data/funcs_1/memory_tb3.txt:
  Auto merged
mysql-test/std_data/funcs_1/memory_tb4.txt:
  Auto merged
mysql-test/std_data/funcs_1/myisam_tb1.txt:
  Auto merged
mysql-test/std_data/funcs_1/myisam_tb2.txt:
  Auto merged
mysql-test/std_data/funcs_1/myisam_tb3.txt:
  Auto merged
mysql-test/std_data/funcs_1/myisam_tb4.txt:
  Auto merged
mysql-test/std_data/funcs_1/t3.txt:
  Auto merged
mysql-test/std_data/funcs_1/t4.txt:
  Auto merged
mysql-test/std_data/funcs_1/t7.txt:
  Auto merged
mysql-test/std_data/funcs_1/t9.txt:
  Auto merged
mysql-test/suite/funcs_1/README.txt:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Auto merged
mysql-test/suite/funcs_1/include/innodb_tb1.inc:
  Auto merged
mysql-test/suite/funcs_1/include/innodb_tb2.inc:
  Auto merged
mysql-test/suite/funcs_1/include/innodb_tb3.inc:
  Auto merged
mysql-test/suite/funcs_1/include/innodb_tb4.inc:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb1.inc:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb2.inc:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb3.inc:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb4.inc:
  Auto merged
mysql-test/suite/funcs_1/include/myisam_tb1.inc:
  Auto merged
mysql-test/suite/funcs_1/include/myisam_tb2.inc:
  Auto merged
mysql-test/suite/funcs_1/include/myisam_tb3.inc:
  Auto merged
mysql-test/suite/funcs_1/include/myisam_tb4.inc:
  Auto merged
mysql-test/suite/funcs_1/include/sp_tb.inc:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_views.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_columns_memory.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_09.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
  Auto merged
mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
  Auto merged
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
  Auto merged
mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_03.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_08.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_09.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
  Auto merged
mysql-test/suite/funcs_1/views/func_view.inc:
  Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
  Auto merged
2008-05-13 15:56:07 +02:00
..
.cvsignore
…
CMakeLists.txt
scripts/CMakeLists.txt : Treat "mysql_upgrade_shell" the same way as all the other scripts.
2008-03-04 22:00:53 +01:00
comp_sql.c
Add "name of struct" as first arg to comp_sql
2007-04-23 14:01:48 +02: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_binary_distribution.sh:
2008-04-28 21:53:52 +02:00
make_sharedlib_distribution.sh
my_strtoll10-x86.s:
2006-12-31 01:02:27 +01:00
make_win_bin_dist
Merge trift2.:/MySQL/M50/clone-5.0
2008-03-14 15:09:10 +01:00
Makefile.am
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
2008-03-06 15:13:14 +00:00
msql2mysql.sh
gen_lex_hash.cc:
2007-01-31 00:06:42 +01:00
mysql_config.pl.in
make_win_bin_dist CMakeLists.txt resolveip.c Makefile.am:
2007-12-28 01:02:28 +01:00
mysql_config.sh
Merge trift2.:/MySQL/M51/mysql-5.1
2008-03-14 14:41:08 +01:00
mysql_convert_table_format.sh
Merge mysql.com:/home/kent/bk/windows-cleanup/mysql-5.0-build
2007-12-28 01:07:42 +01:00
mysql_find_rows.sh
my_strtoll10-x86.s:
2006-12-31 01:02:27 +01:00
mysql_fix_extensions.sh
…
mysql_fix_privilege_tables.sh
Bug #15327: configure: --with-tcp-port option being partially ignored
2007-09-13 16:19:46 +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
Bug #33192: mysql_install_db bad merge, corrupt code == appears to succeed but does nothing
2007-12-12 19:14:28 -07:00
mysql_secure_installation.pl.in
Makefile.am, CMakeLists.txt, mysql_secure_installation.pl.in:
2007-12-28 22:58:54 +01:00
mysql_secure_installation.sh
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-01-01 05:31:23 +01:00
mysql_setpermission.sh
Option 6 tries to grant global privileges at the database level
2007-08-01 11:58:25 +02: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
Bug#35824: mysql_upgrade does not fix scheduler tables when upgrading from 5.1.23 to 5.1.24
2008-04-04 13:46:05 -03:00
mysql_system_tables.sql
Bug#32633 Can not create any routine if SQL_MODE=no_engine_substitution
2008-02-07 08:47:39 -02: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
my_strtoll10-x86.s:
2006-12-31 01:02:27 +01:00
mysqlaccess.conf
…
mysqlaccess.sh
BUG#24780 workaround for broken installations that depend on using /etc, but were configured differently
2007-01-09 09:32:56 +01: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
make_win_bin_dist CMakeLists.txt resolveip.c Makefile.am:
2007-12-28 01:02:28 +01:00
mysqld_safe.sh
Bug #32679: mysqld_safe looks for errmsg.sys in wrong path
2007-12-03 18:19:35 -07:00
mysqldumpslow.sh
make_win_bin_dist CMakeLists.txt resolveip.c Makefile.am:
2007-12-28 01:02:28 +01:00
mysqlhotcopy.sh
Bug #27101 mysqlhotcopy --record_log_pos retrieves wrong slave parameters
2008-03-07 15:45:40 -05:00