Below is the list of changes that have just been committed into a local
5.2 repository of serg. When serg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-06-20 23:36:00+02:00, serg@stripped +9 -0
after merge
mysql-test/r/locktrans_innodb.result@stripped, 2007-06-20 23:35:55+02:00, serg@stripped +12 -12
after merge
mysql-test/r/locktrans_myisam.result@stripped, 2007-06-20 23:35:55+02:00, serg@stripped +19 -19
after merge
mysql-test/r/rpl_locktrans_innodb.result@stripped, 2007-06-20 23:35:55+02:00, serg@stripped +12 -12
after merge
mysql-test/r/rpl_locktrans_myisam.result@stripped, 2007-06-20 23:35:55+02:00, serg@stripped +19 -19
after merge
mysql-test/r/rpl_row_until.result@stripped, 2007-06-20 23:35:56+02:00, serg@stripped +4 -4
after merge
mysql-test/t/system_mysql_db_fix50117.test@stripped, 2007-06-20 23:35:56+02:00, serg@stripped +3 -3
after merge
sql/set_var.h@stripped, 2007-06-20 23:35:56+02:00, serg@stripped +0 -2
after merge
sql/table.cc@stripped, 2007-06-20 23:35:56+02:00, serg@stripped +3 -2
after merge
sql/unireg.cc@stripped, 2007-06-20 23:35:56+02:00, serg@stripped +3 -3
after merge
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: serg
# Host: janus.mylan
# Root: /usr/home/serg/Abk/mysql-5.2
--- 1.294/sql/table.cc 2007-06-20 23:36:06 +02:00
+++ 1.295/sql/table.cc 2007-06-20 23:36:06 +02:00
@@ -502,7 +502,7 @@
if (!(pos=get_form_pos(file,head,(TYPELIB*) 0)))
goto err; /* purecov: inspected */
VOID(my_seek(file,pos,MY_SEEK_SET,MYF(0)));
- if (my_read(file,(byte*) forminfo,288,MYF(MY_NABP)))
+ if (my_read(file,forminfo,288,MYF(MY_NABP)))
goto err;
share->frm_version= head[2];
@@ -838,7 +838,8 @@
goto err;
}
share->comment.length = uint2korr(next_chunk);
- if (! (share->comment.str= strmake_root(&share->mem_root, next_chunk + 2, share->comment.length)))
+ if (! (share->comment.str= strmake_root(&share->mem_root,
+ (char*)next_chunk + 2, share->comment.length)))
{
my_free(buff, MYF(0));
goto err;
--- 1.103/sql/unireg.cc 2007-06-20 23:36:06 +02:00
+++ 1.104/sql/unireg.cc 2007-06-20 23:36:06 +02:00
@@ -163,7 +163,7 @@
my_error(ER_WRONG_STRING_LENGTH, MYF(0),
create_info->comment.str,"TABLE COMMENT",
(uint) TABLE_COMMENT_MAXLEN);
- my_free((gptr) screen_buff,MYF(0));
+ my_free(screen_buff,MYF(0));
DBUG_RETURN(1);
}
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
@@ -271,8 +271,8 @@
{
uchar comment_length_buff[2];
int2store(comment_length_buff,create_info->comment.length);
- if (my_write(file, (byte*) comment_length_buff, 2, MYF(MY_NABP)) ||
- my_write(file, (byte*) create_info->comment.str,
+ if (my_write(file, comment_length_buff, 2, MYF(MY_NABP)) ||
+ my_write(file, (uchar*)create_info->comment.str,
create_info->comment.length, MYF(MY_NABP)))
goto err;
}
--- 1.4/mysql-test/r/locktrans_innodb.result 2007-06-20 23:36:06 +02:00
+++ 1.5/mysql-test/r/locktrans_innodb.result 2007-06-20 23:36:06 +02:00
@@ -93,12 +93,12 @@
# Implicit lock method conversion due to mix in statement.
LOCK TABLE t1 READ, t2 IN EXCLUSIVE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't2'
+Warning 1589 Converted to non-transactional lock on 't2'
UNLOCK TABLES;
# Lock t1 share (converted to read), t2 write.
LOCK TABLE t1 IN SHARE MODE, t2 WRITE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't1'
+Warning 1589 Converted to non-transactional lock on 't1'
# Show t1 is read locked, t2 write locked.
INSERT INTO t1 SELECT * FROM t2;
ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
@@ -109,8 +109,8 @@
# Lock t1 exclusive (converted to write), t2 share (converted to read).
LOCK TABLE t1 IN EXCLUSIVE MODE, t2 IN SHARE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't1'
-Warning 1588 Converted to non-transactional lock on 't2'
+Warning 1589 Converted to non-transactional lock on 't1'
+Warning 1589 Converted to non-transactional lock on 't2'
# Show t1 is write locked, t2 read locked.
INSERT INTO t1 SELECT * FROM t2;
INSERT INTO t2 SELECT * FROM t1;
@@ -134,8 +134,8 @@
## Error is reported on first table only. Show both errors:
SHOW WARNINGS;
Level Code Message
-Error 1589 Cannot convert to non-transactional lock in strict mode on 't1'
-Error 1589 Cannot convert to non-transactional lock in strict mode on 't2'
+Error 1590 Cannot convert to non-transactional lock in strict mode on 't1'
+Error 1590 Cannot convert to non-transactional lock in strict mode on 't2'
UNLOCK TABLES;
SET @@SQL_MODE= @wl3561_save_sql_mode;
#
@@ -155,7 +155,7 @@
# Request a transactional lock, which is converted to non-transactional.
LOCK TABLE t4 IN SHARE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't4'
+Warning 1589 Converted to non-transactional lock on 't4'
# Try a conflict with the existing non-transactional lock.
INSERT INTO t4 VALUES(444);
ERROR HY000: Table 't4' was locked with a READ lock and can't be updated
@@ -172,8 +172,8 @@
# Request a share lock on the view, which is converted to read locks.
LOCK TABLE v1 IN SHARE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't3'
-Warning 1588 Converted to non-transactional lock on 't4'
+Warning 1589 Converted to non-transactional lock on 't3'
+Warning 1589 Converted to non-transactional lock on 't4'
# Show that read locks on the base tables prohibit writing ...
INSERT INTO t3 SELECT * FROM t4;
ERROR HY000: Table 't3' was locked with a READ lock and can't be updated
@@ -189,7 +189,7 @@
## Report conversion on view due to existing non-transactional locks.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 'v1'
+Warning 1589 Converted to non-transactional lock on 'v1'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
@@ -198,8 +198,8 @@
## Now report conversion on base table again.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't3'
-Warning 1588 Converted to non-transactional lock on 't4'
+Warning 1589 Converted to non-transactional lock on 't3'
+Warning 1589 Converted to non-transactional lock on 't4'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
--- 1.3/mysql-test/r/locktrans_myisam.result 2007-06-20 23:36:06 +02:00
+++ 1.4/mysql-test/r/locktrans_myisam.result 2007-06-20 23:36:06 +02:00
@@ -21,8 +21,8 @@
# Valid syntax for transactional locks.
LOCK TABLE t1 IN SHARE MODE, t2 IN EXCLUSIVE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't1'
-Warning 1588 Converted to non-transactional lock on 't2'
+Warning 1589 Converted to non-transactional lock on 't1'
+Warning 1589 Converted to non-transactional lock on 't2'
UNLOCK TABLES;
#
# Valid syntax for aliases with and without 'AS'.
@@ -30,19 +30,19 @@
UNLOCK TABLES;
LOCK TABLE t1 AS a1 IN SHARE MODE, t2 a2 IN EXCLUSIVE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 'a1'
-Warning 1588 Converted to non-transactional lock on 'a2'
+Warning 1589 Converted to non-transactional lock on 'a1'
+Warning 1589 Converted to non-transactional lock on 'a2'
UNLOCK TABLES;
#
# Transactional locks taken on a view.
CREATE VIEW v1 AS SELECT * FROM t1, t2 WHERE t1.c1 = t2.c2;
LOCK TABLE v1 IN SHARE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't1'
-Warning 1588 Converted to non-transactional lock on 't2'
+Warning 1589 Converted to non-transactional lock on 't1'
+Warning 1589 Converted to non-transactional lock on 't2'
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 'v1'
+Warning 1589 Converted to non-transactional lock on 'v1'
DROP VIEW v1;
#
# Locking INFORMATION_SCHEMA fails on missing privileges.
@@ -93,12 +93,12 @@
# Implicit lock method conversion due to mix in statement.
LOCK TABLE t1 READ, t2 IN EXCLUSIVE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't2'
+Warning 1589 Converted to non-transactional lock on 't2'
UNLOCK TABLES;
# Lock t1 share (converted to read), t2 write.
LOCK TABLE t1 IN SHARE MODE, t2 WRITE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't1'
+Warning 1589 Converted to non-transactional lock on 't1'
# Show t1 is read locked, t2 write locked.
INSERT INTO t1 SELECT * FROM t2;
ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
@@ -109,8 +109,8 @@
# Lock t1 exclusive (converted to write), t2 share (converted to read).
LOCK TABLE t1 IN EXCLUSIVE MODE, t2 IN SHARE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't1'
-Warning 1588 Converted to non-transactional lock on 't2'
+Warning 1589 Converted to non-transactional lock on 't1'
+Warning 1589 Converted to non-transactional lock on 't2'
# Show t1 is write locked, t2 read locked.
INSERT INTO t1 SELECT * FROM t2;
INSERT INTO t2 SELECT * FROM t1;
@@ -134,8 +134,8 @@
## Error is reported on first table only. Show both errors:
SHOW WARNINGS;
Level Code Message
-Error 1589 Cannot convert to non-transactional lock in strict mode on 't1'
-Error 1589 Cannot convert to non-transactional lock in strict mode on 't2'
+Error 1590 Cannot convert to non-transactional lock in strict mode on 't1'
+Error 1590 Cannot convert to non-transactional lock in strict mode on 't2'
UNLOCK TABLES;
SET @@SQL_MODE= @wl3561_save_sql_mode;
#
@@ -155,7 +155,7 @@
# Request a transactional lock, which is converted to non-transactional.
LOCK TABLE t4 IN SHARE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't4'
+Warning 1589 Converted to non-transactional lock on 't4'
# Try a conflict with the existing non-transactional lock.
INSERT INTO t4 VALUES(444);
ERROR HY000: Table 't4' was locked with a READ lock and can't be updated
@@ -172,8 +172,8 @@
# Request a share lock on the view, which is converted to read locks.
LOCK TABLE v1 IN SHARE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't3'
-Warning 1588 Converted to non-transactional lock on 't4'
+Warning 1589 Converted to non-transactional lock on 't3'
+Warning 1589 Converted to non-transactional lock on 't4'
# Show that read locks on the base tables prohibit writing ...
INSERT INTO t3 SELECT * FROM t4;
ERROR HY000: Table 't3' was locked with a READ lock and can't be updated
@@ -189,7 +189,7 @@
## Report conversion on view due to existing non-transactional locks.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 'v1'
+Warning 1589 Converted to non-transactional lock on 'v1'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
@@ -198,8 +198,8 @@
## Now report conversion on base table again.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't3'
-Warning 1588 Converted to non-transactional lock on 't4'
+Warning 1589 Converted to non-transactional lock on 't3'
+Warning 1589 Converted to non-transactional lock on 't4'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
--- 1.3/mysql-test/r/rpl_locktrans_innodb.result 2007-06-20 23:36:06 +02:00
+++ 1.4/mysql-test/r/rpl_locktrans_innodb.result 2007-06-20 23:36:06 +02:00
@@ -99,12 +99,12 @@
# Implicit lock method conversion due to mix in statement.
LOCK TABLE t1 READ, t2 IN EXCLUSIVE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't2'
+Warning 1589 Converted to non-transactional lock on 't2'
UNLOCK TABLES;
# Lock t1 share (converted to read), t2 write.
LOCK TABLE t1 IN SHARE MODE, t2 WRITE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't1'
+Warning 1589 Converted to non-transactional lock on 't1'
# Show t1 is read locked, t2 write locked.
INSERT INTO t1 SELECT * FROM t2;
ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
@@ -115,8 +115,8 @@
# Lock t1 exclusive (converted to write), t2 share (converted to read).
LOCK TABLE t1 IN EXCLUSIVE MODE, t2 IN SHARE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't1'
-Warning 1588 Converted to non-transactional lock on 't2'
+Warning 1589 Converted to non-transactional lock on 't1'
+Warning 1589 Converted to non-transactional lock on 't2'
# Show t1 is write locked, t2 read locked.
INSERT INTO t1 SELECT * FROM t2;
INSERT INTO t2 SELECT * FROM t1;
@@ -140,8 +140,8 @@
## Error is reported on first table only. Show both errors:
SHOW WARNINGS;
Level Code Message
-Error 1589 Cannot convert to non-transactional lock in strict mode on 't1'
-Error 1589 Cannot convert to non-transactional lock in strict mode on 't2'
+Error 1590 Cannot convert to non-transactional lock in strict mode on 't1'
+Error 1590 Cannot convert to non-transactional lock in strict mode on 't2'
UNLOCK TABLES;
SET @@SQL_MODE= @wl3561_save_sql_mode;
#
@@ -161,7 +161,7 @@
# Request a transactional lock, which is converted to non-transactional.
LOCK TABLE t4 IN SHARE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't4'
+Warning 1589 Converted to non-transactional lock on 't4'
# Try a conflict with the existing non-transactional lock.
INSERT INTO t4 VALUES(444);
ERROR HY000: Table 't4' was locked with a READ lock and can't be updated
@@ -178,8 +178,8 @@
# Request a share lock on the view, which is converted to read locks.
LOCK TABLE v1 IN SHARE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't3'
-Warning 1588 Converted to non-transactional lock on 't4'
+Warning 1589 Converted to non-transactional lock on 't3'
+Warning 1589 Converted to non-transactional lock on 't4'
# Show that read locks on the base tables prohibit writing ...
INSERT INTO t3 SELECT * FROM t4;
ERROR HY000: Table 't3' was locked with a READ lock and can't be updated
@@ -195,7 +195,7 @@
## Report conversion on view due to existing non-transactional locks.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 'v1'
+Warning 1589 Converted to non-transactional lock on 'v1'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
@@ -204,8 +204,8 @@
## Now report conversion on base table again.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't3'
-Warning 1588 Converted to non-transactional lock on 't4'
+Warning 1589 Converted to non-transactional lock on 't3'
+Warning 1589 Converted to non-transactional lock on 't4'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
--- 1.3/mysql-test/r/rpl_locktrans_myisam.result 2007-06-20 23:36:06 +02:00
+++ 1.4/mysql-test/r/rpl_locktrans_myisam.result 2007-06-20 23:36:06 +02:00
@@ -27,8 +27,8 @@
# Valid syntax for transactional locks.
LOCK TABLE t1 IN SHARE MODE, t2 IN EXCLUSIVE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't1'
-Warning 1588 Converted to non-transactional lock on 't2'
+Warning 1589 Converted to non-transactional lock on 't1'
+Warning 1589 Converted to non-transactional lock on 't2'
UNLOCK TABLES;
#
# Valid syntax for aliases with and without 'AS'.
@@ -36,19 +36,19 @@
UNLOCK TABLES;
LOCK TABLE t1 AS a1 IN SHARE MODE, t2 a2 IN EXCLUSIVE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 'a1'
-Warning 1588 Converted to non-transactional lock on 'a2'
+Warning 1589 Converted to non-transactional lock on 'a1'
+Warning 1589 Converted to non-transactional lock on 'a2'
UNLOCK TABLES;
#
# Transactional locks taken on a view.
CREATE VIEW v1 AS SELECT * FROM t1, t2 WHERE t1.c1 = t2.c2;
LOCK TABLE v1 IN SHARE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't1'
-Warning 1588 Converted to non-transactional lock on 't2'
+Warning 1589 Converted to non-transactional lock on 't1'
+Warning 1589 Converted to non-transactional lock on 't2'
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 'v1'
+Warning 1589 Converted to non-transactional lock on 'v1'
DROP VIEW v1;
#
# Locking INFORMATION_SCHEMA fails on missing privileges.
@@ -99,12 +99,12 @@
# Implicit lock method conversion due to mix in statement.
LOCK TABLE t1 READ, t2 IN EXCLUSIVE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't2'
+Warning 1589 Converted to non-transactional lock on 't2'
UNLOCK TABLES;
# Lock t1 share (converted to read), t2 write.
LOCK TABLE t1 IN SHARE MODE, t2 WRITE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't1'
+Warning 1589 Converted to non-transactional lock on 't1'
# Show t1 is read locked, t2 write locked.
INSERT INTO t1 SELECT * FROM t2;
ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
@@ -115,8 +115,8 @@
# Lock t1 exclusive (converted to write), t2 share (converted to read).
LOCK TABLE t1 IN EXCLUSIVE MODE, t2 IN SHARE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't1'
-Warning 1588 Converted to non-transactional lock on 't2'
+Warning 1589 Converted to non-transactional lock on 't1'
+Warning 1589 Converted to non-transactional lock on 't2'
# Show t1 is write locked, t2 read locked.
INSERT INTO t1 SELECT * FROM t2;
INSERT INTO t2 SELECT * FROM t1;
@@ -140,8 +140,8 @@
## Error is reported on first table only. Show both errors:
SHOW WARNINGS;
Level Code Message
-Error 1589 Cannot convert to non-transactional lock in strict mode on 't1'
-Error 1589 Cannot convert to non-transactional lock in strict mode on 't2'
+Error 1590 Cannot convert to non-transactional lock in strict mode on 't1'
+Error 1590 Cannot convert to non-transactional lock in strict mode on 't2'
UNLOCK TABLES;
SET @@SQL_MODE= @wl3561_save_sql_mode;
#
@@ -161,7 +161,7 @@
# Request a transactional lock, which is converted to non-transactional.
LOCK TABLE t4 IN SHARE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't4'
+Warning 1589 Converted to non-transactional lock on 't4'
# Try a conflict with the existing non-transactional lock.
INSERT INTO t4 VALUES(444);
ERROR HY000: Table 't4' was locked with a READ lock and can't be updated
@@ -178,8 +178,8 @@
# Request a share lock on the view, which is converted to read locks.
LOCK TABLE v1 IN SHARE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't3'
-Warning 1588 Converted to non-transactional lock on 't4'
+Warning 1589 Converted to non-transactional lock on 't3'
+Warning 1589 Converted to non-transactional lock on 't4'
# Show that read locks on the base tables prohibit writing ...
INSERT INTO t3 SELECT * FROM t4;
ERROR HY000: Table 't3' was locked with a READ lock and can't be updated
@@ -195,7 +195,7 @@
## Report conversion on view due to existing non-transactional locks.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 'v1'
+Warning 1589 Converted to non-transactional lock on 'v1'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
@@ -204,8 +204,8 @@
## Now report conversion on base table again.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1588 Converted to non-transactional lock on 't3'
-Warning 1588 Converted to non-transactional lock on 't4'
+Warning 1589 Converted to non-transactional lock on 't3'
+Warning 1589 Converted to non-transactional lock on 't4'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
--- 1.8/mysql-test/r/rpl_row_until.result 2007-06-20 23:36:06 +02:00
+++ 1.9/mysql-test/r/rpl_row_until.result 2007-06-20 23:36:06 +02:00
@@ -19,7 +19,7 @@
2
3
4
-show slave status;
+SHOW SLAVE STATUS;;
Slave_IO_State #
Master_Host 127.0.0.1
Master_User root
@@ -61,7 +61,7 @@
2
3
4
-show slave status;
+SHOW SLAVE STATUS;;
Slave_IO_State #
Master_Host 127.0.0.1
Master_User root
@@ -101,7 +101,7 @@
n
1
2
-show slave status;
+SHOW SLAVE STATUS;;
Slave_IO_State #
Master_Host 127.0.0.1
Master_User root
@@ -139,7 +139,7 @@
start slave;
stop slave;
start slave until master_log_file='master-bin.000001', master_log_pos=740;
-show slave status;
+SHOW SLAVE STATUS;;
Slave_IO_State #
Master_Host 127.0.0.1
Master_User root
--- 1.108/sql/set_var.h 2007-06-20 23:36:06 +02:00
+++ 1.109/sql/set_var.h 2007-06-20 23:36:06 +02:00
@@ -911,8 +911,6 @@
bool update(THD *thd, set_var *var);
};
->>>>>>>
-
/**
Handler for setting the system variable --read-only.
*/
--- 1.1/mysql-test/t/system_mysql_db_fix50117.test 2007-06-20 23:36:06 +02:00
+++ 1.2/mysql-test/t/system_mysql_db_fix50117.test 2007-06-20 23:36:06 +02:00
@@ -41,9 +41,9 @@
CREATE TABLE IF NOT EXISTS servers ( Server_name char(64) NOT NULL DEFAULT '', Host char(64) NOT NULL DEFAULT '', Db char(64) NOT NULL DEFAULT '', Username char(64) NOT NULL DEFAULT '', Password char(64) NOT NULL DEFAULT '', Port INT(4) NOT NULL DEFAULT '0', Socket char(64) NOT NULL DEFAULT '', Wrapper char(64) NOT NULL DEFAULT '', Owner char(64) NOT NULL DEFAULT '', PRIMARY KEY (Server_name)) CHARACTER SET utf8 comment='MySQL Foreign Servers table';
-CREATE TABLE IF NOT EXISTS tables_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Timestamp timestamp(14), Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Table privileges';
+CREATE TABLE IF NOT EXISTS tables_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Timestamp timestamp, Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Table privileges';
-CREATE TABLE IF NOT EXISTS columns_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Column_name char(64) binary DEFAULT '' NOT NULL, Timestamp timestamp(14), Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name,Column_name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Column privileges';
+CREATE TABLE IF NOT EXISTS columns_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Column_name char(64) binary DEFAULT '' NOT NULL, Timestamp timestamp, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name,Column_name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Column privileges';
CREATE TABLE IF NOT EXISTS help_topic ( help_topic_id int unsigned not null, name char(64) not null, help_category_id smallint unsigned not null, description text not null, example text not null, url char(128) not null, primary key (help_topic_id), unique index (name) ) engine=MyISAM CHARACTER SET utf8 comment='help topics';
@@ -76,7 +76,7 @@
CREATE TABLE IF NOT EXISTS proc ( db char(64) collate utf8_bin DEFAULT '' NOT NULL, name char(64) DEFAULT '' NOT NULL, type enum('FUNCTION','PROCEDURE') NOT NULL, specific_name char(64) DEFAULT '' NOT NULL, language enum('SQL') DEFAULT 'SQL' NOT NULL, sql_data_access enum('CONTAINS_SQL', 'NO_SQL', 'READS_SQL_DATA', 'MODIFIES_SQL_DATA' ) DEFAULT 'CONTAINS_SQL' NOT NULL, is_deterministic enum('YES','NO') DEFAULT 'NO' NOT NULL, security_type enum('INVOKER','DEFINER') DEFAULT 'DEFINER' NOT NULL, param_list blob NOT NULL, returns char(64) DEFAULT '' NOT NULL, body longblob NOT NULL, definer char(77) collate utf8_bin DEFAULT '' NOT NULL, created timestamp, modified timestamp, sql_mode set( 'REAL_AS_FLOAT', 'PIPES_AS_CONCAT', 'ANSI_QUOTES', 'IGNORE_SPACE', 'NOT_USED', 'ONLY_FULL_GROUP_BY', 'NO_UNSIGNED_SUBTRACTION', 'NO_DIR_IN_CREATE', 'POSTGRESQL', 'ORACLE', 'MSSQL', 'DB2', 'MAXDB', 'NO_KEY_OPTIONS', 'NO_TABLE_OPTIONS', 'NO_FIELD_OPTIONS', 'MYSQL323', 'MYSQL40', 'ANSI', 'NO!
_AUTO_VALUE_ON_ZERO', 'NO_BACKSLASH_ESCAPES', 'STRICT_TRANS_TABLES', 'STRICT_ALL_TABLES', 'NO_ZERO_IN_DATE', 'NO_ZERO_DATE', 'INVALID_DATES', 'ERROR_FOR_DIVISION_BY_ZERO', 'TRADITIONAL', 'NO_AUTO_CREATE_USER', 'HIGH_NOT_PRECEDENCE' ) DEFAULT '' NOT NULL, comment char(64) collate utf8_bin DEFAULT '' NOT NULL, PRIMARY KEY (db,name,type) ) engine=MyISAM character set utf8 comment='Stored Procedures';
-CREATE TABLE IF NOT EXISTS procs_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Routine_name char(64) binary DEFAULT '' NOT NULL, Routine_type enum('FUNCTION','PROCEDURE') NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Proc_priv set('Execute','Alter Routine','Grant') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Timestamp timestamp(14), PRIMARY KEY (Host,Db,User,Routine_name,Routine_type), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Procedure privileges';
+CREATE TABLE IF NOT EXISTS procs_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Routine_name char(64) binary DEFAULT '' NOT NULL, Routine_type enum('FUNCTION','PROCEDURE') NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Proc_priv set('Execute','Alter Routine','Grant') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Timestamp timestamp, PRIMARY KEY (Host,Db,User,Routine_name,Routine_type), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Procedure privileges';
CREATE TABLE IF NOT EXISTS event ( db char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', name char(64) CHARACTER SET utf8 NOT NULL default '', body longblob NOT NULL, definer char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', execute_at DATETIME default NULL, interval_value int(11) default NULL, interval_field ENUM('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') default NULL, created TIMESTAMP NOT NULL, modified TIMESTAMP NOT NULL, last_executed DATETIME default NULL, starts DATETIME default NULL, ends DATETIME default NULL, status ENUM('ENABLED','DISABLED') NOT NULL default 'ENABLED', on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP', sql_mode set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_!
GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE') DEFAULT '' NOT NULL, comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', time_zone char(64) CHARACTER SET latin1 NOT NULL DEFAULT 'SYSTEM', PRIMARY KEY (db, name) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';
| Thread |
|---|
| • bk commit into 5.2 tree (serg:1.2520) | Sergei Golubchik | 20 Jun |
