Below is the list of changes that have just been committed into a local
5.0 repository of jamppa. When jamppa 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-01-11 16:42:48+01:00, jani@stripped +5 -0
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
MERGE: 1.2356.3.3
libmysqld/lib_sql.cc@stripped, 2007-01-11 16:42:44+01:00, jani@stripped +0 -0
Auto merged
MERGE: 1.119.1.1
sql/item_func.cc@stripped, 2007-01-11 16:42:44+01:00, jani@stripped +0 -0
Auto merged
MERGE: 1.317.1.3
sql/item_strfunc.cc@stripped, 2007-01-11 16:42:44+01:00, jani@stripped +0 -0
Auto merged
MERGE: 1.290.1.2
sql/mysqld.cc@stripped, 2007-01-11 16:42:44+01:00, jani@stripped +0 -0
Auto merged
MERGE: 1.582.1.4
sql/sql_prepare.cc@stripped, 2007-01-11 16:42:44+01:00, jani@stripped +0 -0
Auto merged
MERGE: 1.187.1.2
# 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: jani
# Host: bk-internal.mysql.com
# Root: /data0/bk/mysql-5.0-marvel/RESYNC
--- 1.319/sql/item_func.cc 2007-01-11 16:42:55 +01:00
+++ 1.320/sql/item_func.cc 2007-01-11 16:42:55 +01:00
@@ -3388,7 +3388,11 @@
}
else
{
+#ifdef EMBEDDED_LIBRARY
+ if (ull->locked && pthread_equal(current_thd->real_id,ull->thread))
+#else
if (ull->locked && pthread_equal(pthread_self(),ull->thread))
+#endif
{
result=1; // Release is ok
item_user_lock_release(ull);
--- 1.292/sql/item_strfunc.cc 2007-01-11 16:42:55 +01:00
+++ 1.293/sql/item_strfunc.cc 2007-01-11 16:42:55 +01:00
@@ -37,15 +37,6 @@
String my_empty_string("",default_charset_info);
-static void my_coll_agg_error(DTCollation &c1, DTCollation &c2,
- const char *fname)
-{
- my_error(ER_CANT_AGGREGATE_2COLLATIONS, MYF(0),
- c1.collation->name, c1.derivation_name(),
- c2.collation->name, c2.derivation_name(),
- fname);
-}
-
String *Item_str_func::check_well_formed_result(String *str)
{
@@ -3228,15 +3219,17 @@
int i;
if (my_gethwaddr(mac))
{
+ /* purecov: begin inspected */
/*
generating random "hardware addr"
and because specs explicitly specify that it should NOT correlate
with a clock_seq value (initialized random below), we use a separate
randominit() here
*/
- randominit(&uuid_rand, tmp + (ulong) thd, tmp + (ulong)query_id);
+ randominit(&uuid_rand, tmp + (ulong) thd, tmp + (ulong)global_query_id);
for (i=0; i < (int)sizeof(mac); i++)
mac[i]=(uchar)(my_rnd(&uuid_rand)*255);
+ /* purecov: end */
}
s=clock_seq_and_node_str+sizeof(clock_seq_and_node_str)-1;
for (i=sizeof(mac)-1 ; i>=0 ; i--)
@@ -3244,7 +3237,7 @@
*--s=_dig_vec_lower[mac[i] & 15];
*--s=_dig_vec_lower[mac[i] >> 4];
}
- randominit(&uuid_rand, tmp + (ulong)start_time,
+ randominit(&uuid_rand, tmp + (ulong) server_start_time,
tmp + thd->status_var.bytes_sent);
set_clock_seq_str();
}
--- 1.584/sql/mysqld.cc 2007-01-11 16:42:55 +01:00
+++ 1.585/sql/mysqld.cc 2007-01-11 16:42:55 +01:00
@@ -4806,8 +4806,10 @@
{"binlog-ignore-db", OPT_BINLOG_IGNORE_DB,
"Tells the master that updates to the given database should not be logged tothe binary log.",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+#ifndef DISABLE_GRANT_OPTIONS
{"bootstrap", OPT_BOOTSTRAP, "Used by mysql installation scripts.", 0, 0, 0,
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
{"character-set-client-handshake", OPT_CHARACTER_SET_CLIENT_HANDSHAKE,
"Don't ignore client side character set value sent during handshake.",
(gptr*) &opt_character_set_client_handshake,
@@ -4923,9 +4925,11 @@
{"init-connect", OPT_INIT_CONNECT, "Command(s) that are executed for each new connection",
(gptr*) &opt_init_connect, (gptr*) &opt_init_connect, 0, GET_STR_ALLOC,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+#ifndef DISABLE_GRANT_OPTIONS
{"init-file", OPT_INIT_FILE, "Read SQL commands from this file at startup.",
(gptr*) &opt_init_file, (gptr*) &opt_init_file, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0},
+#endif
{"init-rpl-role", OPT_INIT_RPL_ROLE, "Set the replication role.", 0, 0, 0,
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"init-slave", OPT_INIT_SLAVE, "Command(s) that are executed when a slave connects to this master",
@@ -5380,10 +5384,12 @@
"Show user and password in SHOW SLAVE HOSTS on this master",
(gptr*) &opt_show_slave_auth_info, (gptr*) &opt_show_slave_auth_info, 0,
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+#ifndef DISABLE_GRANT_OPTIONS
{"skip-grant-tables", OPT_SKIP_GRANT,
"Start without grant tables. This gives all users FULL ACCESS to all tables!",
(gptr*) &opt_noacl, (gptr*) &opt_noacl, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0,
0},
+#endif
{"skip-host-cache", OPT_SKIP_HOST_CACHE, "Don't cache host names.", 0, 0, 0,
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"skip-locking", OPT_SKIP_LOCK,
--- 1.124/libmysqld/lib_sql.cc 2007-01-11 16:42:55 +01:00
+++ 1.125/libmysqld/lib_sql.cc 2007-01-11 16:42:55 +01:00
@@ -1052,7 +1052,7 @@
data->embedded_info->prev_ptr= &cur->next;
next_field=cur->data;
next_mysql_field= data->embedded_info->fields_list;
-err:
+
DBUG_VOID_RETURN;
}
--- 1.189/sql/sql_prepare.cc 2007-01-11 16:42:55 +01:00
+++ 1.190/sql/sql_prepare.cc 2007-01-11 16:42:55 +01:00
@@ -1251,7 +1251,6 @@
lex->select_lex.context.resolve_in_select_list= TRUE;
-#ifndef NO_EMBEDDED_ACCESS_CHECKS
ulong privilege= lex->exchange ? SELECT_ACL | FILE_ACL : SELECT_ACL;
if (tables)
{
@@ -1260,7 +1259,6 @@
}
else if (check_access(thd, privilege, any_db,0,0,0,0))
goto error;
-#endif
if (!lex->result && !(lex->result= new (stmt->mem_root) select_send))
{
| Thread |
|---|
| • bk commit into 5.0 tree (jani:1.2367) | jani | 11 Jan |
