Commit 20c07238 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.1 

into  mysql.com:/home/mydev/mysql-5.1-wl1563
parents 810576ee d8753a82

BUILD/SETUP.sh

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ fast_cflags="-O3 -fno-omit-frame-pointer" 
reckless_cflags="-O3 -fomit-frame-pointer "



debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX"

debug_extra_cflags="-O0"

debug_extra_cflags="-O1 -Wuninitialized"



base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"

amd64_cxxflags=""				# If dropping '--with-big-tables', add here  "-DBIG_TABLES"

scripts/mysql_create_system_tables.sh

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ then 
  c_d="$c_d   Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"

  c_d="$c_d   Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"

  c_d="$c_d   Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"

  c_d="$c_d   Event_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"

  c_d="$c_d PRIMARY KEY Host (Host,Db,User),"

  c_d="$c_d KEY User (User)"

  c_d="$c_d ) engine=MyISAM"
@@ -150,6 +151,7 @@ then 
  c_u="$c_u   Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"

  c_u="$c_u   Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"

  c_u="$c_u   Create_user_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"

  c_u="$c_u   Event_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"

  c_u="$c_u   ssl_type enum('','ANY','X509', 'SPECIFIED') COLLATE utf8_general_ci DEFAULT '' NOT NULL,"

  c_u="$c_u   ssl_cipher BLOB NOT NULL,"

  c_u="$c_u   x509_issuer BLOB NOT NULL,"