Commit 9fc80208 authored by unknown's avatar unknown
Browse files

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

into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0


sql/sql_acl.cc:
  Auto merged
parents 16b6ced0 6809ceb7

myisam/mi_check.c

+8 −0
Original line number Diff line number Diff line
@@ -3871,6 +3871,14 @@ int update_state_info(MI_CHECK *param, MI_INFO *info,uint update) 
      if (!share->state.create_time)

	share->state.create_time=share->state.check_time;

    }

    /*

      When tables are locked we haven't synched the share state and the

      real state for a while so we better do it here before synching

      the share state to disk. Only when table is write locked is it

      necessary to perform this synch.

    */

    if (info->lock_type == F_WRLCK)

      share->state.state= *info->state;

    if (mi_state_info_write(share->kfile,&share->state,1+2))

      goto err;

    share->changed=0;

mysql-test/r/analyze.result

0 → 100644
+32 −0
Original line number Diff line number Diff line 
create table t1 (a bigint);

lock tables t1 write;

insert into t1 values(0);

analyze table t1;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	OK

unlock tables;

check table t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

create table t1 (a bigint);

insert into t1 values(0);

lock tables t1 write;

delete from t1;

analyze table t1;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	OK

unlock tables;

check table t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

create table t1 (a bigint);

insert into t1 values(0);

analyze table t1;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	OK

check table t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

mysql-test/r/create.result

+6 −0
Original line number Diff line number Diff line
@@ -596,3 +596,9 @@ ERROR 42000: Incorrect database name 'xyz' 
create table t1(t1.name int);

create table t2(test.t2.name int);

drop table t1,t2;

create database mysqltest;

use mysqltest;

drop database mysqltest;

create table test.t1 like x;

ERROR 42000: Incorrect database name 'NULL'

drop table if exists test.t1;

mysql-test/r/innodb_handler.result

+16 −0
Original line number Diff line number Diff line
@@ -132,6 +132,22 @@ a b 
handler t2 read last;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1

handler t2 close;

handler t1 open;

handler t1 read a next;

a	b

14	aaa

handler t1 read a next;

a	b

15	bbb

handler t1 close;

handler t1 open;

handler t1 read a prev;

a	b

22	iii

handler t1 read a prev;

a	b

21	hhh

handler t1 close;

handler t1 open as t2;

handler t2 read first;

a	b

mysql-test/r/sql_mode.result

+2 −0
Original line number Diff line number Diff line
@@ -138,6 +138,8 @@ t1 CREATE TABLE `t1` ( 
  `min_num` decimal(7,6) default '0.000001'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1 ;

set @@SQL_MODE=NULL;

ERROR 42000: Variable 'sql_mode' can't be set to the value of 'NULL'

SET @OLD_SQL_MODE=@@SQL_MODE, @@SQL_MODE='';

show local variables like 'SQL_MODE';

Variable_name	Value