Below is the list of changes that have just been committed into a local
5.1 repository of pem. When pem 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
1.1966 05/12/07 15:17:18 pem@stripped +9 -0
Merge mysql.com:/usr/home/pem/bug14834/mysql-5.0
into mysql.com:/usr/home/pem/mysql-5.1-new
sql/sql_yacc.yy
1.428 05/12/07 15:17:10 pem@stripped +0 -0
Merge.
sql/sql_table.cc
1.283 05/12/07 15:17:10 pem@stripped +0 -0
Merge.
sql/sql_parse.cc
1.494 05/12/07 15:17:10 pem@stripped +0 -0
Merge.
sql/sp_head.cc
1.204 05/12/07 15:17:10 pem@stripped +0 -0
Merge.
sql/share/errmsg.txt
1.60 05/12/07 15:17:10 pem@stripped +6 -0
Manual merge.
mysql-test/r/view.result
1.140 05/12/07 15:17:10 pem@stripped +0 -0
Merge.
mysql-test/r/sp.result
1.175 05/12/07 15:17:10 pem@stripped +0 -0
Merge.
configure.in
1.318 05/12/07 15:17:10 pem@stripped +0 -1
Manual merge.
BitKeeper/triggers/post-commit
1.32 05/12/07 15:17:10 pem@stripped +0 -0
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: pem
# Host: mysql.comhem.se
# Root: /usr/home/pem/mysql-5.1-new/RESYNC
--- 1.493/sql/sql_parse.cc 2005-12-07 11:19:39 +01:00
+++ 1.494/sql/sql_parse.cc 2005-12-07 15:17:10 +01:00
@@ -2614,7 +2614,8 @@
goto error; /* purecov: inspected */
thd->enable_slow_log= opt_log_slow_admin_statements;
res = mysql_backup_table(thd, first_table);
-
+ (TABLE_LIST*) select_lex->table_list.first=first_table;
+ lex->query_tables=all_tables;
break;
}
case SQLCOM_RESTORE_TABLE:
@@ -2626,6 +2627,8 @@
goto error; /* purecov: inspected */
thd->enable_slow_log= opt_log_slow_admin_statements;
res = mysql_restore_table(thd, first_table);
+ (TABLE_LIST*) select_lex->table_list.first=first_table;
+ lex->query_tables=all_tables;
break;
}
case SQLCOM_ASSIGN_TO_KEYCACHE:
@@ -3119,6 +3122,8 @@
mysql_bin_log.write(&qinfo);
}
}
+ (TABLE_LIST*) select_lex->table_list.first=first_table;
+ lex->query_tables=all_tables;
break;
}
case SQLCOM_CHECK:
@@ -3129,6 +3134,8 @@
goto error; /* purecov: inspected */
thd->enable_slow_log= opt_log_slow_admin_statements;
res = mysql_check_table(thd, first_table, &lex->check_opt);
+ (TABLE_LIST*) select_lex->table_list.first=first_table;
+ lex->query_tables=all_tables;
break;
}
case SQLCOM_ANALYZE:
@@ -3149,6 +3156,8 @@
mysql_bin_log.write(&qinfo);
}
}
+ (TABLE_LIST*) select_lex->table_list.first=first_table;
+ lex->query_tables=all_tables;
break;
}
@@ -3172,6 +3181,8 @@
mysql_bin_log.write(&qinfo);
}
}
+ (TABLE_LIST*) select_lex->table_list.first=first_table;
+ lex->query_tables=all_tables;
break;
}
case SQLCOM_UPDATE:
--- 1.282/sql/sql_table.cc 2005-11-30 21:14:07 +01:00
+++ 1.283/sql/sql_table.cc 2005-12-07 15:17:10 +01:00
@@ -2412,18 +2412,14 @@
*/
lex->query_tables= table;
lex->query_tables_last= &table->next_global;
- lex->query_tables_own_last= 0;;
+ lex->query_tables_own_last= 0;
thd->no_warnings_for_error= no_warnings_for_error;
+ if (view_operator_func == NULL)
+ table->required_type=FRMTYPE_TABLE;
open_and_lock_tables(thd, table);
thd->no_warnings_for_error= 0;
table->next_global= save_next_global;
table->next_local= save_next_local;
- /* if view are unsupported */
- if (table->view && view_operator_func == NULL)
- {
- result_code= HA_ADMIN_NOT_BASE_TABLE;
- goto send_result;
- }
thd->open_options&= ~extra_open_options;
if (prepare_func)
--- 1.427/sql/sql_yacc.yy 2005-12-07 11:19:39 +01:00
+++ 1.428/sql/sql_yacc.yy 2005-12-07 15:17:10 +01:00
@@ -4406,11 +4406,6 @@
OPTIMIZE opt_no_write_to_binlog table_or_tables
{
LEX *lex=Lex;
- if (lex->sphead)
- {
- my_error(ER_SP_BADSTATEMENT, MYF(0), "OPTIMIZE TABLE");
- YYABORT;
- }
lex->sql_command = SQLCOM_OPTIMIZE;
lex->no_write_to_binlog= $2;
lex->check_opt.init();
--- 1.59/sql/share/errmsg.txt 2005-12-07 11:19:39 +01:00
+++ 1.60/sql/share/errmsg.txt 2005-12-07 15:17:10 +01:00
@@ -4590,7 +4590,7 @@
nla "De gebruikte SELECT commando's hebben een verschillend aantal kolommen"
eng "The used SELECT statements have a different number of columns"
est "Tulpade arv kasutatud SELECT lausetes ei kattu"
ita "La SELECT utilizzata ha un numero di colonne differente"
@@ -5271,7 +5271,7 @@
ER_VIEW_WRONG_LIST
eng "View's SELECT and view's field list have different column counts"
- ger "SELECT- und Feldliste der Views haben eine unterschiedliche Anzahl von Spalten"
+ ger "SELECT- und Feldliste der Views haben unterschiedliche Anzahlen von Spalten"
ER_WARN_VIEW_MERGE
@@ -5482,7 +5482,7 @@
ER_FAILED_ROUTINE_BREAK_BINLOG
eng "A routine failed and has neither NO SQL nor READS SQL DATA in its declaration and binary logging is enabled; if non-transactional tables were updated, the binary log will miss their changes"
ER_BINLOG_UNSAFE_ROUTINE
eng "This function has none of DETERMINISTIC, NO SQL, or READS SQL DATA in its declaration and binary logging is enabled (you *might* want to use the less safe log_bin_trust_function_creators variable)"
@@ -5722,3 +5722,14 @@
eng "Plugin '%-.64s' is not loaded"
ER_WRONG_VALUE
eng "Incorrect %-.32s value: '%-.128s'"
+ER_TRG_NO_DEFINER
+ eng "No definer attribute for trigger '%-.64s'.'%-.64s'. The trigger will be activated under the authorization of the invoker, which may have insufficient privileges. Please recreate the trigger."
+ER_OLD_FILE_FORMAT
+ eng "'%-.64s' has an old format, you should re-create the '%s' object(s)"
+ ger "'%-.64s' hat altes Format, Sie sollten die '%s'-Objekt(e) neu erzeugen"
+ER_SP_RECURSION_LIMIT
+ eng "Recursive limit %d (as set by the max_sp_recursion_depth variable) was exceeded for routine %.64s"
+ER_SP_PROC_TABLE_CORRUPT
+ eng "Failed to load routine %s. The table mysql.proc is missing, corrupt, or contains bad data (internal code %d)"
--- 1.139/mysql-test/r/view.result 2005-12-03 07:53:14 +01:00
+++ 1.140/mysql-test/r/view.result 2005-12-07 15:17:10 +01:00
@@ -2383,20 +2383,25 @@
CREATE VIEW v1 AS SELECT id FROM t1;
OPTIMIZE TABLE v1;
Table Op Msg_type Msg_text
-test.v1 optimize note Unknown table 'test.v1'
+test.v1 optimize error 'test.v1' is not BASE TABLE
+Warnings:
+Error 1347 'test.v1' is not BASE TABLE
ANALYZE TABLE v1;
Table Op Msg_type Msg_text
-test.v1 analyze note Unknown table 'test.v1'
+test.v1 analyze error 'test.v1' is not BASE TABLE
+Warnings:
+Error 1347 'test.v1' is not BASE TABLE
REPAIR TABLE v1;
Table Op Msg_type Msg_text
-test.v1 repair note Unknown table 'test.v1'
+test.v1 repair error 'test.v1' is not BASE TABLE
+Warnings:
+Error 1347 'test.v1' is not BASE TABLE
DROP TABLE t1;
OPTIMIZE TABLE v1;
Table Op Msg_type Msg_text
-test.v1 optimize note Unknown table 'test.v1'
+test.v1 optimize error 'test.v1' is not BASE TABLE
Warnings:
-Error 1146 Table 'test.t1' doesn't exist
-Error 1356 View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
+Error 1347 'test.v1' is not BASE TABLE
DROP VIEW v1;
create definer = current_user() sql security invoker view v1 as select 1;
show create view v1;
--- 1.174/mysql-test/r/sp.result 2005-12-07 03:22:47 +01:00
+++ 1.175/mysql-test/r/sp.result 2005-12-07 15:17:10 +01:00
@@ -4100,8 +4100,6 @@
4711
drop procedure bug14376|
drop procedure if exists p1|
-Warnings:
-Note 1305 PROCEDURE p1 does not exist
drop table if exists t1|
create table t1 (a varchar(255))|
insert into t1 (a) values ("a - table column")|
@@ -4153,6 +4151,89 @@
a - local variable in a nested compound statement
A local variable in a nested compound statement takes precedence over table column in cursors
a - local variable in a nested compound statement
+drop procedure p1|
+drop procedure if exists bug13012|
+create procedure bug13012()
+BEGIN
+REPAIR TABLE t1;
+BACKUP TABLE t1 to '../tmp';
+DROP TABLE t1;
+RESTORE TABLE t1 FROM '../tmp';
+END|
+call bug13012()|
+Table Op Msg_type Msg_text
+test.t1 repair status OK
+Table Op Msg_type Msg_text
+test.t1 backup status OK
+Table Op Msg_type Msg_text
+test.t1 restore status OK
+drop procedure bug13012|
+create view v1 as select * from t1|
+create procedure bug13012()
+BEGIN
+REPAIR TABLE t1,t2,t3,v1;
+OPTIMIZE TABLE t1,t2,t3,v1;
+ANALYZE TABLE t1,t2,t3,v1;
+END|
+call bug13012()|
+Table Op Msg_type Msg_text
+test.t1 repair status OK
+test.t2 repair status OK
+test.t3 repair error Table 'test.t3' doesn't exist
+test.v1 repair error 'test.v1' is not BASE TABLE
+Table Op Msg_type Msg_text
+test.t1 optimize status OK
+test.t2 optimize status OK
+test.t3 optimize error Table 'test.t3' doesn't exist
+test.v1 optimize error 'test.v1' is not BASE TABLE
+Table Op Msg_type Msg_text
+test.t1 analyze status Table is already up to date
+test.t2 analyze status Table is already up to date
+test.t3 analyze error Table 'test.t3' doesn't exist
+test.v1 analyze error 'test.v1' is not BASE TABLE
+Warnings:
+Error 1347 'test.v1' is not BASE TABLE
+call bug13012()|
+Table Op Msg_type Msg_text
+test.t1 repair status OK
+test.t2 repair status OK
+test.t3 repair error Table 'test.t3' doesn't exist
+test.v1 repair error 'test.v1' is not BASE TABLE
+Table Op Msg_type Msg_text
+test.t1 optimize status OK
+test.t2 optimize status OK
+test.t3 optimize error Table 'test.t3' doesn't exist
+test.v1 optimize error 'test.v1' is not BASE TABLE
+Table Op Msg_type Msg_text
+test.t1 analyze status Table is already up to date
+test.t2 analyze status Table is already up to date
+test.t3 analyze error Table 'test.t3' doesn't exist
+test.v1 analyze error 'test.v1' is not BASE TABLE
+Warnings:
+Error 1347 'test.v1' is not BASE TABLE
+call bug13012()|
+Table Op Msg_type Msg_text
+test.t1 repair status OK
+test.t2 repair status OK
+test.t3 repair error Table 'test.t3' doesn't exist
+test.v1 repair error 'test.v1' is not BASE TABLE
+Table Op Msg_type Msg_text
+test.t1 optimize status OK
+test.t2 optimize status OK
+test.t3 optimize error Table 'test.t3' doesn't exist
+test.v1 optimize error 'test.v1' is not BASE TABLE
+Table Op Msg_type Msg_text
+test.t1 analyze status Table is already up to date
+test.t2 analyze status Table is already up to date
+test.t3 analyze error Table 'test.t3' doesn't exist
+test.v1 analyze error 'test.v1' is not BASE TABLE
+Warnings:
+Error 1347 'test.v1' is not BASE TABLE
+drop procedure bug13012|
+drop view v1;
+select * from t1|
+a
+a - table column
drop schema if exists mysqltest1|
Warnings:
Note 1008 Can't drop database 'mysqltest1'; database doesn't exist
--- 1.203/sql/sp_head.cc 2005-12-07 03:22:48 +01:00
+++ 1.204/sql/sp_head.cc 2005-12-07 15:17:10 +01:00
@@ -72,7 +72,11 @@
}
/* fallthrough */
case SQLCOM_ANALYZE:
+ case SQLCOM_OPTIMIZE:
+ case SQLCOM_PRELOAD_KEYS:
+ case SQLCOM_ASSIGN_TO_KEYCACHE:
case SQLCOM_CHECKSUM:
+ case SQLCOM_CHECK:
case SQLCOM_HA_READ:
case SQLCOM_SHOW_BINLOGS:
case SQLCOM_SHOW_BINLOG_EVENTS:
@@ -107,6 +111,9 @@
case SQLCOM_SHOW_WARNS:
case SQLCOM_SHOW_PROC_CODE:
case SQLCOM_SHOW_FUNC_CODE:
+ case SQLCOM_REPAIR:
+ case SQLCOM_BACKUP_TABLE:
+ case SQLCOM_RESTORE_TABLE:
flags= sp_head::MULTI_RESULTS;
break;
/*
--- 1.31/BitKeeper/triggers/post-commit 2005-04-19 11:07:37 +02:00
+++ 1.32/BitKeeper/triggers/post-commit 2005-12-07 15:17:10 +01:00
@@ -2,7 +2,7 @@
#shift
FROM=$USER@stripped
-INTERNALS=internals@stripped
+COMMITS=commits@stripped
DOCS=docs-commit@stripped
LIMIT=10000
VERSION="5.1"
@@ -61,14 +61,14 @@
) | /usr/sbin/sendmail -t
#++
-# internals@ mail
+# commits@ mail
#--
- echo "Notifying internals list at $INTERNALS"
+ echo "Notifying commits list at $COMMITS"
(
cat <<EOF
List-ID: <bk.mysql-$VERSION>
From: $FROM
-To: $INTERNALS
+To: $COMMITS
Subject: bk commit into $VERSION tree ($CHANGESET)$BS
X-CSetKey: <$CSETKEY>
$BH
| Thread |
|---|
| • bk commit into 5.1 tree (pem:1.1966) | pem | 7 Dec |
