1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge april.(none):/home/svoj/devel/bk/mysql-5.1-engines

Browse Source 
into  april.(none):/home/svoj/devel/mysql/BUG32050/mysql-5.1-engines
This commit is contained in:
svoj@mysql.com/april.(none) 2007-11-29 23:51:05 +04:00
commit c7b75f18a3
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/mysql_system_tables_fix.sql
View File

@ -513,6 +513,22 @@ ALTER TABLE tables_priv MODIFY Table_priv set('Select','Insert','Update','Delete
UPDATE user SET Trigger_priv=Super_priv WHERE @hadTriggerPriv = 0; UPDATE user SET Trigger_priv=Super_priv WHERE @hadTriggerPriv = 0;
#
# Log Table
#
ALTER TABLE general_log
MODIFY COLUMN user_host MEDIUMTEXT NOT NULL,
MODIFY COLUMN thread_id INTEGER NOT NULL,
MODIFY COLUMN server_id INTEGER NOT NULL,
MODIFY COLUMN command_type VARCHAR(64) NOT NULL,
MODIFY COLUMN argument MEDIUMTEXT NOT NULL;
ALTER TABLE slow_log
MODIFY COLUMN db VARCHAR(512) NOT NULL,
MODIFY COLUMN last_insert_id INTEGER NOT NULL,
MODIFY COLUMN insert_id INTEGER NOT NULL,
MODIFY COLUMN server_id INTEGER NOT NULL;
# Activate the new, possible modified privilege tables # Activate the new, possible modified privilege tables
# This should not be needed, but gives us some extra testing that the above # This should not be needed, but gives us some extra testing that the above
# changes was correct # changes was correct

8
storage/csv/ha_tina.cc
View File

@ -472,14 +472,6 @@ int ha_tina::encode_quote(uchar *buf)
const char *ptr; const char *ptr;
const char *end_ptr; const char *end_ptr;
const bool was_null= (*field)->is_null(); const bool was_null= (*field)->is_null();
/*
CSV does not support nulls. ::create() prevents creation of a table
with nullable columns so if we encounter them here, there is a bug.
This may only occur if the frm was created by an older version of
mysqld which permitted table creation with nullable columns.
*/
DBUG_ASSERT(!(*field)->maybe_null());
/* /*
assistance for backwards compatibility in production builds. assistance for backwards compatibility in production builds.