mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-04 14:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-formergecomm

Browse source 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-unified02


BitKeeper/etc/collapsed:
  auto-union
configure.in:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
  Auto merged
BitKeeper/deleted/.del-ha_berkeley.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/r/func_in.result:
  Auto merged
mysql-test/r/mysqlcheck.result:
  Auto merged
mysql-test/t/func_in.test:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/mysqlcheck.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
include/my_dbug.h:
  Manual merge.
mysql-test/r/information_schema.result:
  Manual merge.
mysql-test/r/information_schema_db.result:
  Manual merge.
mysql-test/r/mysqlshow.result:
  Manual merge.
sql/Makefile.am:
  Manual merge.
sql/lex.h:
  Manual merge.
sql/lock.cc:
  Manual merge.
sql/mysql_priv.h:
  Manual merge.
sql/mysqld.cc:
  Manual merge.
sql/set_var.cc:
  Manual merge.
sql/slave.cc:
  Manual merge.
sql/sql_base.cc:
  Manual merge.
sql/sql_delete.cc:
  Manual merge.
sql/sql_insert.cc:
  Manual merge.
sql/sql_lex.h:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
sql/sql_select.cc:
  Manual merge.
sql/sql_show.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
sql/sql_update.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge.
sql/structs.h:
  Manual merge.
sql/table.h:
  Manual merge.
storage/archive/ha_archive.cc:
  Manual merge.
storage/ndb/src/common/util/File.cpp:
  Manual merge.
storage/ndb/src/ndbapi/DictCache.cpp:
  Manual merge.
support-files/mysql.spec.sh:
  Manual merge.
This commit is contained in:
unknown 2007-04-27 16:45:01 -04:00
commit 4687fe01d7
48 changed files with 2285 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

20
sql/sql_table.cc
View file

@ -3525,7 +3525,7 @@ bool mysql_create_table_internal(THD *thd,
}
}
thd->proc_info="creating table";
thd_proc_info(thd, "creating table");
create_info->table_existed= 0; // Mark that table is created
if (thd->variables.sql_mode & MODE_NO_DIR_IN_CREATE)
@ -3565,7 +3565,7 @@ unlock_and_end:
VOID(pthread_mutex_unlock(&LOCK_open));
err:
thd->proc_info="After create";
thd_proc_info(thd, "After create");
delete file;
DBUG_RETURN(error);
@ -4949,7 +4949,7 @@ mysql_discard_or_import_tablespace(THD *thd,
ALTER TABLE
*/
thd->proc_info="discard_or_import_tablespace";
thd_proc_info(thd, "discard_or_import_tablespace");
discard= test(tablespace_op == DISCARD_TABLESPACE);
@ -4966,7 +4966,7 @@ mysql_discard_or_import_tablespace(THD *thd,
error=table->file->discard_or_import_tablespace(discard);
thd->proc_info="end";
thd_proc_info(thd, "end");
if (error)
goto err;
@ -5413,7 +5413,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
}
}
thd->proc_info="init";
thd_proc_info(thd, "init");
if (!(create_info= copy_create_info(lex_create_info)))
{
DBUG_RETURN(TRUE);
@ -5585,7 +5585,7 @@ view_err:
DBUG_RETURN(TRUE);
}
thd->proc_info="setup";
thd_proc_info(thd, "setup");
if (!(alter_info->flags & ~(ALTER_RENAME | ALTER_KEYS_ONOFF)) &&
!table->s->tmp_table) // no need to touch frm
{
@ -5640,7 +5640,7 @@ view_err:
if (!error && (new_name != table_name || new_db != db))
{
thd->proc_info="rename";
thd_proc_info(thd, "rename");
/* Then do a 'simple' rename of the table */
if (!access(new_name_buff,F_OK))
{
@ -6291,7 +6291,7 @@ view_err:
/* Copy the data if necessary. */
thd->count_cuted_fields= CHECK_FIELD_WARN; // calc cuted fields
thd->cuted_fields=0L;
thd->proc_info="copy to tmp table";
thd_proc_info(thd, "copy to tmp table");
copied=deleted=0;
if (new_table && !(new_table->file->ha_table_flags() & HA_NO_COPY_ON_ALTER))
{
@ -6516,7 +6516,7 @@ view_err:
from the cache, free all locks, close the old table and remove it.
*/
thd->proc_info="rename result table";
thd_proc_info(thd, "rename result table");
my_snprintf(old_name, sizeof(old_name), "%s2-%lx-%lx", tmp_file_prefix,
current_pid, thd->thread_id);
if (lower_case_table_names)
@ -6691,7 +6691,7 @@ view_err:
if (error)
goto err;
}
thd->proc_info="end";
thd_proc_info(thd, "end");
ha_binlog_log_query(thd, create_info->db_type, LOGCOM_ALTER_TABLE,
thd->query, thd->query_length,