mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.1
This commit is contained in:
gluh@gluh.mysql.r18.ru 2004-11-17 18:49:09 +03:00
commit 505324c17a
3 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mysql-test/r/information_schema.result
View file

@ -439,3 +439,9 @@ v
call px5()//
v
9
create table t1 (a int not null auto_increment,b int, primary key (a));
insert into t1 values (1,1),(NULL,3),(NULL,4);
select AUTO_INCREMENT from information_schema.tables where table_name = 't1';
AUTO_INCREMENT
4
drop table t1;

7
mysql-test/t/information_schema.test
View file

@ -218,7 +218,8 @@ call px5()//
call px5()//
delimiter ;//
create table t1 (a int not null auto_increment,b int, primary key (a));
insert into t1 values (1,1),(NULL,3),(NULL,4);
select AUTO_INCREMENT from information_schema.tables where table_name = 't1';
drop table t1;

18
sql/sql_show.cc
View file

@ -2116,7 +2116,7 @@ static int get_schema_tables_record(THD *thd, struct st_table_list *tables,
}
table->field[11]->store((longlong) file->index_file_length);
table->field[12]->store((longlong) file->delete_length);
if (table->found_next_number_field)
if (show_table->found_next_number_field)
{
show_table->next_number_field=show_table->found_next_number_field;
show_table->next_number_field->reset();
@ -2196,12 +2196,16 @@ static int get_schema_tables_record(THD *thd, struct st_table_list *tables,
table->field[19]->store(option_buff+1,
(ptr == option_buff ? 0 :
(uint) (ptr-option_buff)-1), cs);
char *comment= show_table->file->
update_table_comment(show_table->comment);
table->field[20]->store(comment, strlen(comment), cs);
if (comment != show_table->comment)
my_free(comment,MYF(0));
{
char *comment= show_table->file->
update_table_comment(show_table->comment);
if (comment)
{
table->field[20]->store(comment, strlen(comment), cs);
if (comment != show_table->comment)
my_free(comment,MYF(0));
}
}
}
table->file->write_row(table->record[0]);
DBUG_RETURN(0);