database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge

Browse Source 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge


BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/sp.result:
  Manual merge.  Place 5.0 test before 5.1 test.
mysql-test/t/sp.test:
  Manual merge.  Place 5.0 test before 5.1 test.
mysys/my_bitmap.c:
  Manual merge.
scripts/make_binary_distribution.sh:
  Manual merge.
sql/Makefile.am:
  Manual merge.
sql/slave.cc:
  Manual merge.
sql/sql_class.h:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
sql/sql_select.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.
This commit is contained in:
unknown
2006-08-09 13:37:20 +04:00
parent b6897efbb8 10888499ee
commit 22b92457fc
25 changed files with 260 additions and 4952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_class.h
View File

@@ -43,6 +43,7 @@ enum enum_mark_columns
{ MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE};
extern char internal_table_name[2];
extern char empty_c_string[1];
extern const char **errmesg;
#define TC_LOG_PAGE_SIZE 8192
@@ -1986,11 +1987,21 @@ public:
{
db.str=0;
}
inline Table_ident(SELECT_LEX_UNIT *s) : sel(s)
/*
This constructor is used only for the case when we create a derived
table. A derived table has no name and doesn't belong to any database.
Later, if there was an alias specified for the table, it will be set
by add_table_to_list.
*/
inline Table_ident(SELECT_LEX_UNIT *s) : sel(s)
{
/* We must have a table name here as this is used with add_table_to_list */
db.str=0; table.str= internal_table_name; table.length=1;
db.str= empty_c_string; /* a subject to casedn_str */
db.length= 0;
table.str= internal_table_name;
table.length=1;
}
bool is_derived_table() const { return test(sel); }
inline void change_db(char *db_name)
{
db.str= db_name; db.length= (uint) strlen(db_name);