diff options
| author | unknown <venu@myvenu.com> | 2003-06-03 18:45:53 -0700 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2003-06-03 18:45:53 -0700 |
| commit | ff820c2724e01072db4d5e5c8e56cd4608c9ddb8 (patch) | |
| tree | 1880214478347ec771d96d2b41ffe284cb799b2c /sql | |
| parent | 0831433e8f8005331d68cd7edd708feb76dd3325 (diff) | |
| parent | fc59ec4eddbd4f6f518795dcd231b5343234350f (diff) | |
| download | mariadb-git-ff820c2724e01072db4d5e5c8e56cd4608c9ddb8.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_cmpfunc.cc | 1 | ||||
| -rw-r--r-- | sql/mysqld.cc | 3 | ||||
| -rw-r--r-- | sql/sql_insert.cc | 2 | ||||
| -rw-r--r-- | sql/sql_show.cc | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 299014689f0..74036edf605 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -246,7 +246,6 @@ void Item_bool_func2::fix_length_and_dec() We must set cmp_charset here as we may be called from for an automatic generated item, like in natural join */ -end: set_cmp_charset(args[0]->charset(), args[0]->coercibility, args[1]->charset(), args[1]->coercibility); } diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 7011f6dcd36..1a595c46e81 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -423,7 +423,7 @@ Query_cache query_cache; #endif #ifdef HAVE_SMEM char *shared_memory_base_name= default_shared_memory_base_name; -my_bool opt_enable_shared_memory; +bool opt_enable_shared_memory; #endif #include "sslopt-vars.h" @@ -471,7 +471,6 @@ static void close_connections(void) #ifdef EXTRA_DEBUG int count=0; #endif - NET net; DBUG_ENTER("close_connections"); /* Clear thread cache */ diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 1908f898a27..c3a399cd5a7 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -188,7 +188,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, if (duplic == DUP_UPDATE && !table->insert_values) { /* it should be allocated before Item::fix_fields() */ - table->insert_values=alloc_root(&table->mem_root, table->rec_buff_length); + table->insert_values=(byte *)alloc_root(&table->mem_root, table->rec_buff_length); if (!table->insert_values) goto abort; } diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 803280c56c6..277bc5d8337 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1451,7 +1451,6 @@ int mysqld_show_collations(THD *thd, const char *wild) List<Item> field_list; CHARSET_INFO **cs; Protocol *protocol= thd->protocol; - char flags[64]; DBUG_ENTER("mysqld_show_charsets"); @@ -1503,7 +1502,6 @@ int mysqld_show_charsets(THD *thd, const char *wild) List<Item> field_list; CHARSET_INFO **cs; Protocol *protocol= thd->protocol; - char flags[64]; DBUG_ENTER("mysqld_show_charsets"); |