database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge mysql.com:/home/jimw/my/mysql-5.1-release

Browse Source 
into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/t/alter_table.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/show_check.result:
  Resolve conflict
sql/authors.h:
  Resolve conflicts, update replication/backup developers
This commit is contained in:
unknown
2005-11-30 13:51:23 -08:00
parent 8486e64f3b b6547d09d6
commit 9c81773b37
31 changed files with 2025 additions and 972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/mysql-test-run.pl
View File

@ -927,6 +927,9 @@ sub executable_setup () {
"$path_client_bindir/mysqld-debug",);
$path_language= mtr_path_exists("$glob_basedir/share/english/");
$path_charsetsdir= mtr_path_exists("$glob_basedir/share/charsets");
$exe_my_print_defaults=
mtr_exe_exists("$path_client_bindir/my_print_defaults");
}
else
{
@ -937,6 +940,8 @@ sub executable_setup () {
$exe_im= mtr_exe_exists(
"$glob_basedir/server-tools/instance-manager/mysqlmanager");
$exe_my_print_defaults=
mtr_exe_exists("$glob_basedir/extra/my_print_defaults");
}
if ( $glob_use_embedded_server )
@ -963,8 +968,6 @@ sub executable_setup () {
$exe_mysql= mtr_exe_exists("$path_client_bindir/mysql");
$exe_mysql_fix_system_tables=
mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables");
$exe_my_print_defaults=
mtr_script_exists("$glob_basedir/extra/my_print_defaults");
$path_ndb_tools_dir= mtr_path_exists("$glob_basedir/storage/ndb/tools");
$exe_ndb_mgm= "$glob_basedir/storage/ndb/src/mgmclient/ndb_mgm";
}
@ -982,7 +985,7 @@ sub executable_setup () {
mtr_script_exists("$path_client_bindir/mysql_fix_privilege_tables",
"$glob_basedir/scripts/mysql_fix_privilege_tables");
$exe_my_print_defaults=
mtr_script_exists("$path_client_bindir/my_print_defaults");
mtr_exe_exists("$path_client_bindir/my_print_defaults");
$path_language= mtr_path_exists("$glob_basedir/share/mysql/english/",
"$glob_basedir/share/english/");

23
mysql-test/r/show_check.result
View File

@ -565,25 +565,4 @@ DROP TABLE urkunde;
SHOW TABLES FROM non_existing_database;
ERROR 42000: Unknown database 'non_existing_database'
SHOW AUTHORS;
Name Location Comment
Brian "Krow" Aker Seattle, WA. USA Architecture, archive, federated, buncha of little stuff :)
David Axmark Uppsala, Sweden Small stuff long time ago, Monty ripped it out!
Omer BarNir Sunnyvale, CA. USA Testing (sometimes) and general QA stuff
Reggie Burnett Nashville, TN. USA Windows Server, Connectors
Alexey Botchkov (Holyfoot) Izhevsk Russia GIS extentions (4.1), Embedded Server (4.1), precision math (5.0)
Oleksandr Byelkin Lugansk, Ukraine Query Cache (4.0), Subqueries (4.1), Views (5.0)
Petr Chardin Moscow, Russia Instance Manager (5.0)
Nikolay Grishakin Austin, TX. USA Testing - Server
Eric Herman Amsterdam, Netherlands Bugfixing - federated
Serge Kozlov Velikie Luki, Russia Testing - Cluster
Matthias Leich Berlin, Germany Testing - Server
Dmitri Lenev Moscow, Russia Time zones support (4.1), Triggers (5.0)
Per-Erik Martin Uppsala, Sweden Stored Procedures (5.0)
Jonathan (Jeb) Miller Kyle, TX. USA Testing - Cluster, Replication
Alexander Nozdrin Moscow, Russia Bugfixing (Stored Procedures, 5.0)
Konstantin Osipov Moscow, Russia Prepared statements (4.1), Cursors (5.0)
Carsten Segieth (Pino) Fredersdorf, Germany Testing - Server
Punita Srivastava Austin, TX. USA Testing - Merlin
Alexey Stroganov (Ranger) Lugansk, Ukraine Testing - Benchmarks
Lars Thalmann Stockholm, Sweden Replication and Cluster development
Sergey Vojtovich Izhevsk, Russia Plugins infrastructure (5.1)
End of 5.1 tests

6
mysql-test/t/show_check.test
View File

@ -426,5 +426,9 @@ DROP TABLE urkunde;
SHOW TABLES FROM non_existing_database;
# End of 4.1 tests
#
--disable_result_log
SHOW AUTHORS;
--enable_result_log
--echo End of 5.1 tests

2
mysql-test/t/trigger-compat.test
View File

@ -61,7 +61,7 @@ CREATE TRIGGER wl2818_trg1 BEFORE INSERT ON t1
--echo
--echo ---> patching t1.TRG...
--exec grep --text -v 'definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG
--exec grep -v 'definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG
--exec mv $MYSQL_TEST_DIR/var/tmp/t1.TRG $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG
#

2
mysql-test/t/trigger-grant.test
View File

@ -449,7 +449,7 @@ CREATE TRIGGER trg5 BEFORE DELETE ON t1
FOR EACH ROW
SET @a = 5;
--exec egrep --text -v '^definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG
--exec egrep -v '^definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG
--exec echo "definers='' '@' '@abc@def@@' '@hostname' '@abcdef@@@hostname'" >> $MYSQL_TEST_DIR/var/tmp/t1.TRG
--exec mv $MYSQL_TEST_DIR/var/tmp/t1.TRG $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG