bzr push into mysql-5.0 branch (kgeorge:2583 to 2584) Bug#34159

[Georgi Kodinov]

 2584 Georgi Kodinov	2008-07-31
      Bug#34159: mysql_install_db fails with sql_mode=TRADITIONAL
            
      Reset session sql_mode before creating system tables as it
      is done in the mysql_fix_privilege_tables.sql script.
modified:
  scripts/mysql_system_tables.sql

 2583 Alexey Botchkov	2008-07-28
      Bug#37428 Potential security issue with UDFs - linux shellcode execution.
            
            plugin_dir option backported from 5.1
      
      per-file messages:
        sql/mysql_priv.h
          Bug#37428 Potential security issue with UDFs - linux shellcode execution.
          
          opt_plugin_dir and opt_plugin_dir_ptr declared.
        sql/mysqld.cc
          Bug#37428 Potential security issue with UDFs - linux shellcode execution.
          
          'plugin_dir' option added
        sql/set_var.cc
          Bug#37428 Potential security issue with UDFs - linux shellcode execution.
          
          'plugin_dir' option added.
        sql/sql_udf.cc
          Bug#37428 Potential security issue with UDFs - linux shellcode execution.
          
          opt_plugin_dir added to the udf->dl path. Warn if it's not specified.
        sql/unireg.h
          Bug#37428 Potential security issue with UDFs - linux shellcode execution.
          
          PLUGINDIR defined.
modified:
  sql/mysql_priv.h
  sql/mysqld.cc
  sql/set_var.cc
  sql/sql_udf.cc
  sql/unireg.h

=== modified file 'scripts/mysql_system_tables.sql'
--- a/scripts/mysql_system_tables.sql	2007-04-26 14:48:53 +0000
+++ b/scripts/mysql_system_tables.sql	2008-07-31 09:41:30 +0000
@@ -2,6 +2,7 @@
 -- The system tables of MySQL Server
 --
 
+set sql_mode='';
 set storage_engine=myisam;
 
 CREATE TABLE IF NOT EXISTS db (   Host char(60) binary DEFAULT '' NOT NULL, Db char(64)
binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Select_priv
enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y')
COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE
utf8_general_ci DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') COLLATE utf8_general_ci
DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT
NULL, Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Grant_priv
enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, References_priv enum('N','Y')
COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') COLLATE
utf8_general_ci DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') COLLATE utf8_general_ci
DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT
'N' NOT NULL, Lock_tables_priv enum('N','Y'!
 ) COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_view_priv enum('N','Y') COLLATE
utf8_general_ci DEFAULT 'N' NOT NULL, Show_view_priv enum('N','Y') COLLATE
utf8_general_ci DEFAULT 'N' NOT NULL, Create_routine_priv enum('N','Y') COLLATE
utf8_general_ci DEFAULT 'N' NOT NULL, Alter_routine_priv enum('N','Y') COLLATE
utf8_general_ci DEFAULT 'N' NOT NULL, Execute_priv enum('N','Y') COLLATE utf8_general_ci
DEFAULT 'N' NOT NULL, PRIMARY KEY Host (Host,Db,User), KEY User (User) ) engine=MyISAM
CHARACTER SET utf8 COLLATE utf8_bin comment='Database privileges';