Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.2109 06/04/26 11:39:48 jimw@stripped +4 -0
Merge mysql.com:/home/jimw/my/mysql-5.0-12792
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/t/variables.test
1.58 06/04/26 11:39:44 jimw@stripped +11 -12
Resolve conflict
mysql-test/r/variables.result
1.82 06/04/26 11:39:44 jimw@stripped +7 -8
Resolve conflict
sql/set_var.cc
1.156 06/04/26 11:38:46 jimw@stripped +0 -0
Auto merged
sql/item_func.cc
1.282 06/04/26 11:38:46 jimw@stripped +0 -0
Auto merged
# 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: jimw
# Host: rama.(none)
# Root: /home/jimw/my/mysql-5.0-clean/RESYNC
--- 1.281/sql/item_func.cc 2006-04-22 21:11:24 -07:00
+++ 1.282/sql/item_func.cc 2006-04-26 11:38:46 -07:00
@@ -4558,12 +4558,6 @@
sys_var *var;
LEX_STRING *base_name, *component_name;
- if (component.str == 0 &&
- !my_strcasecmp(system_charset_info, name.str, "VERSION"))
- return new Item_string(NULL, server_version,
- (uint) strlen(server_version),
- system_charset_info, DERIVATION_SYSCONST);
-
if (component.str)
{
base_name= &component;
--- 1.81/mysql-test/r/variables.result 2006-04-26 11:34:41 -07:00
+++ 1.82/mysql-test/r/variables.result 2006-04-26 11:39:44 -07:00
@@ -275,7 +275,7 @@
select @@global.timestamp;
ERROR HY000: Variable 'timestamp' is a SESSION variable
set @@version='';
-ERROR HY000: Unknown system variable 'version'
+ERROR HY000: Variable 'version' is a read only variable
set @@concurrent_insert=1;
ERROR HY000: Variable 'concurrent_insert' is a GLOBAL variable and should be set with SET GLOBAL
set @@global.sql_auto_is_null=1;
@@ -384,6 +384,7 @@
set sql_quote_show_create=1;
set sql_safe_updates=1;
set sql_select_limit=1;
+set sql_select_limit=default;
set sql_warnings=1;
set global table_cache=100;
set storage_engine=myisam;
@@ -604,4 +605,11 @@
show variables like 'sql_warnings';
Variable_name Value
sql_warnings ON
+select @@system_time_zone;
+@@system_time_zone
+#
+select @@version, @@version_comment, @@version_compile_machine,
+@@version_compile_os;
+@@version @@version_comment @@version_compile_machine @@version_compile_os
+# # # #
End of 5.0 tests
--- 1.57/mysql-test/t/variables.test 2006-04-26 11:34:41 -07:00
+++ 1.58/mysql-test/t/variables.test 2006-04-26 11:39:44 -07:00
@@ -169,7 +169,7 @@
set global autocommit=1;
--error 1238
select @@global.timestamp;
---error 1193
+--error 1238
set @@version='';
--error 1229
set @@concurrent_insert=1;
@@ -258,6 +258,8 @@
set sql_quote_show_create=1;
set sql_safe_updates=1;
set sql_select_limit=1;
+# reset it, so later tests don't get confused
+set sql_select_limit=default;
set sql_warnings=1;
set global table_cache=100;
set storage_engine=myisam;
@@ -490,5 +492,20 @@
set @@sql_notes = 1, @@sql_warnings = 1;
show variables like 'sql_notes';
show variables like 'sql_warnings';
+
+#
+# Bug #12792: @@system_time_zone is not SELECTable.
+#
+# Don't actually output, since it depends on the system
+--replace_column 1 #
+select @@system_time_zone;
+
+#
+# Bug #15684: system variables cannot be SELECTed (e.g. @@version_comment)
+#
+# Don't actually output, since it depends on the system
+--replace_column 1 # 2 # 3 # 4 #
+select @@version, @@version_comment, @@version_compile_machine,
+ @@version_compile_os;
--echo End of 5.0 tests
--- 1.155/sql/set_var.cc 2006-04-26 11:33:42 -07:00
+++ 1.156/sql/set_var.cc 2006-04-26 11:38:46 -07:00
@@ -380,6 +380,8 @@
sys_var_sync_binlog_period sys_sync_binlog_period("sync_binlog", &sync_binlog_period);
#endif
sys_var_bool_ptr sys_sync_frm("sync_frm", &opt_sync_frm);
+sys_var_const_str sys_system_time_zone("system_time_zone",
+ system_time_zone);
sys_var_long_ptr sys_table_cache_size("table_cache",
&table_cache_size);
sys_var_long_ptr sys_table_lock_wait_timeout("table_lock_wait_timeout",
@@ -394,6 +396,16 @@
&SV::tmp_table_size);
sys_var_bool_ptr sys_timed_mutexes("timed_mutexes",
&timed_mutexes);
+sys_var_const_str sys_version("version", server_version);
+#ifdef HAVE_BERKELEY_DB
+sys_var_const_str sys_version_bdb("version_bdb", DB_VERSION_STRING);
+#endif
+sys_var_const_str sys_version_comment("version_comment",
+ MYSQL_COMPILATION_COMMENT);
+sys_var_const_str sys_version_compile_machine("version_compile_machine",
+ MACHINE_TYPE);
+sys_var_const_str sys_version_compile_os("version_compile_os",
+ SYSTEM_TYPE);
sys_var_thd_ulong sys_net_wait_timeout("wait_timeout",
&SV::net_wait_timeout);
@@ -549,7 +561,6 @@
/* Read only variables */
-sys_var_const_str sys_os("version_compile_os", SYSTEM_TYPE);
sys_var_readonly sys_have_innodb("have_innodb", OPT_GLOBAL,
SHOW_CHAR, get_have_innodb);
/* Global read-only variable describing server license */
@@ -704,6 +715,7 @@
&sys_sync_binlog_period,
#endif
&sys_sync_frm,
+ &sys_system_time_zone,
&sys_table_cache_size,
&sys_table_lock_wait_timeout,
&sys_table_type,
@@ -716,7 +728,13 @@
&sys_trans_alloc_block_size,
&sys_trans_prealloc_size,
&sys_tx_isolation,
- &sys_os,
+ &sys_version,
+#ifdef HAVE_BERKELEY_DB
+ &sys_version_bdb,
+#endif
+ &sys_version_comment,
+ &sys_version_compile_machine,
+ &sys_version_compile_os,
#ifdef HAVE_INNOBASE_DB
&sys_innodb_fast_shutdown,
&sys_innodb_max_dirty_pages_pct,
@@ -1025,13 +1043,14 @@
{sys_tx_isolation.name, (char*) &sys_tx_isolation, SHOW_SYS},
{sys_updatable_views_with_limit.name,
(char*) &sys_updatable_views_with_limit,SHOW_SYS},
- {"version", server_version, SHOW_CHAR},
+ {sys_version.name, (char*) &sys_version, SHOW_SYS},
#ifdef HAVE_BERKELEY_DB
- {"version_bdb", (char*) DB_VERSION_STRING, SHOW_CHAR},
+ {sys_version_bdb.name, (char*) &sys_version_bdb, SHOW_SYS},
#endif
- {"version_comment", (char*) MYSQL_COMPILATION_COMMENT, SHOW_CHAR},
- {"version_compile_machine", (char*) MACHINE_TYPE, SHOW_CHAR},
- {sys_os.name, (char*) &sys_os, SHOW_SYS},
+ {sys_version_comment.name, (char*) &sys_version_comment, SHOW_SYS},
+ {sys_version_compile_machine.name, (char*) &sys_version_compile_machine,
+ SHOW_SYS},
+ {sys_version_compile_os.name, (char*) &sys_version_compile_os, SHOW_SYS},
{sys_net_wait_timeout.name, (char*) &sys_net_wait_timeout, SHOW_SYS},
{NullS, NullS, SHOW_LONG}
};
| Thread |
|---|
| • bk commit into 5.0 tree (jimw:1.2109) | Jim Winstead | 26 Apr |
