database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge mysql.com:/home/my/mysql-5.0

Browse Source 
into  mysql.com:/home/my/mysql-5.1
This commit is contained in:
monty@mysql.com
2006-02-25 21:54:34 +02:00
parent 066c7148fb 54274976e7
commit 1e2e9e2856
45 changed files with 10745 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_parse.cc
View File

@ -4972,7 +4972,9 @@ end_with_restore_list:
break;
}
default:
#ifndef EMBEDDED_LIBRARY
DBUG_ASSERT(0); /* Impossible */
#endif
send_ok(thd);
break;
}
@ -6149,10 +6151,11 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd,
/*
table_list.next points to the last inserted TABLE_LIST->next_local'
element
We don't use the offsetof() macro here to avoid warnings from gcc
*/
previous_table_ref= (TABLE_LIST*) (table_list.next -
offsetof(TABLE_LIST, next_local));
DBUG_ASSERT(previous_table_ref);
previous_table_ref= (TABLE_LIST*) ((char*) table_list.next -
((char*) &(ptr->next_local) -
(char*) ptr));
/*
Set next_name_resolution_table of the previous table reference to point
to the current table reference. In effect the list