diff options
| author | unknown <antony@pcg5ppc.xiphis.org> | 2007-10-18 15:02:20 -0700 |
|---|---|---|
| committer | unknown <antony@pcg5ppc.xiphis.org> | 2007-10-18 15:02:20 -0700 |
| commit | 8d923eb55973643d171f83616f21466defc89137 (patch) | |
| tree | 5d786973d0f4ced70e4f7a6385ab1803421d9dbe /mysql-test/t/log_tables.test | |
| parent | bf82c2f9b43419a243f231c2a30d05ac5483154b (diff) | |
| parent | 57600b02d0faaa6d3346a66beb6d3cedb273bae3 (diff) | |
| download | mariadb-git-8d923eb55973643d171f83616f21466defc89137.tar.gz | |
Merge pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p1-bug31473.1
into pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p1-bug31473.1-merge-5.1-engines
Diffstat (limited to 'mysql-test/t/log_tables.test')
| -rw-r--r-- | mysql-test/t/log_tables.test | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/t/log_tables.test b/mysql-test/t/log_tables.test index 89c7c255554..06011b85495 100644 --- a/mysql-test/t/log_tables.test +++ b/mysql-test/t/log_tables.test @@ -253,11 +253,11 @@ use mysql; CREATE TABLE `general_log` ( `event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `user_host` mediumtext, - `thread_id` int(11) DEFAULT NULL, - `server_id` int(11) DEFAULT NULL, - `command_type` varchar(64) DEFAULT NULL, - `argument` mediumtext + `user_host` mediumtext NOT NULL, + `thread_id` int(11) NOT NULL, + `server_id` int(11) NOT NULL, + `command_type` varchar(64) NOT NULL, + `argument` mediumtext NOT NULL ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log'; CREATE TABLE `slow_log` ( @@ -268,10 +268,10 @@ CREATE TABLE `slow_log` ( `lock_time` time NOT NULL, `rows_sent` int(11) NOT NULL, `rows_examined` int(11) NOT NULL, - `db` varchar(512) DEFAULT NULL, - `last_insert_id` int(11) DEFAULT NULL, - `insert_id` int(11) DEFAULT NULL, - `server_id` int(11) DEFAULT NULL, + `db` varchar(512) NOT NULL, + `last_insert_id` int(11) NOT NULL, + `insert_id` int(11) NOT NULL, + `server_id` int(11) NOT NULL, `sql_text` mediumtext NOT NULL ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'; |