diff options
| author | unknown <kostja@bodhi.local> | 2006-12-12 13:57:28 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-12-12 13:57:28 +0300 |
| commit | fabf58c6cc475e0d3837f94b5e345d8be059d248 (patch) | |
| tree | e2983d5a19c729d791bd229e0032731aec15c933 /mysql-test/r/log_tables.result | |
| parent | e54bbaa3fb8793905d37af808b9bee6a49df358a (diff) | |
| parent | 62273f8e661c760fbb672ccb0eba80fba34f2c11 (diff) | |
| download | mariadb-git-fabf58c6cc475e0d3837f94b5e345d8be059d248.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.local:/opt/local/work/mysql-5.1-runtime
mysql-test/r/log_tables.result:
Auto merged
sql/handler.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/read_only.result:
Manual merge.
mysql-test/t/read_only.test:
Manual merge.
server-tools/instance-manager/guardian.cc:
Manual merge.
Diffstat (limited to 'mysql-test/r/log_tables.result')
| -rw-r--r-- | mysql-test/r/log_tables.result | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result index 3e8b7d32e88..8264f252287 100644 --- a/mysql-test/r/log_tables.result +++ b/mysql-test/r/log_tables.result @@ -111,9 +111,6 @@ slow_log CREATE TABLE `slow_log` ( ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log' alter table mysql.general_log engine=myisam; alter table mysql.slow_log engine=myisam; -Warnings: -Warning 1366 Incorrect integer value: '' for column 'last_insert_id' at row 0 -Warning 1366 Incorrect integer value: '' for column 'insert_id' at row 0 show create table mysql.general_log; Table Create Table general_log CREATE TABLE `general_log` ( |