diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /scripts/mysql_system_tables_fix.sql | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'scripts/mysql_system_tables_fix.sql')
| -rw-r--r-- | scripts/mysql_system_tables_fix.sql | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql index dea54f3b65d..1ad06b6013d 100644 --- a/scripts/mysql_system_tables_fix.sql +++ b/scripts/mysql_system_tables_fix.sql @@ -1,4 +1,5 @@ --- Copyright (C) 2003, 2010 Oracle and/or its affiliates. All rights reserved. +-- Copyright (C) 2003, 2010 Oracle and/or its affiliates. +-- Copyright (C) 2010, 2011 Monty Program Ab -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -233,7 +234,7 @@ ALTER TABLE func SET @old_log_state = @@global.general_log; SET GLOBAL general_log = 'OFF'; ALTER TABLE general_log - MODIFY event_time TIMESTAMP NOT NULL, + MODIFY event_time TIMESTAMP(6) NOT NULL, MODIFY user_host MEDIUMTEXT NOT NULL, MODIFY thread_id INTEGER NOT NULL, MODIFY server_id INTEGER UNSIGNED NOT NULL, @@ -244,10 +245,10 @@ SET GLOBAL general_log = @old_log_state; SET @old_log_state = @@global.slow_query_log; SET GLOBAL slow_query_log = 'OFF'; ALTER TABLE slow_log - MODIFY start_time TIMESTAMP NOT NULL, + MODIFY start_time TIMESTAMP(6) NOT NULL, MODIFY user_host MEDIUMTEXT NOT NULL, - MODIFY query_time TIME NOT NULL, - MODIFY lock_time TIME NOT NULL, + MODIFY query_time TIME(6) NOT NULL, + MODIFY lock_time TIME(6) NOT NULL, MODIFY rows_sent INTEGER NOT NULL, MODIFY rows_examined INTEGER NOT NULL, MODIFY db VARCHAR(512) NOT NULL, |