Commit 22e418b4 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

merge

parents fad7880b 777fdb5d

Docs/manual.texi

+7 −2
Original line number Diff line number Diff line
@@ -32638,7 +32638,7 @@ create_definition: 
  or    INDEX [index_name] (index_col_name,...)

  or    UNIQUE [INDEX] [index_name] (index_col_name,...)

  or    FULLTEXT [INDEX] [index_name] (index_col_name,...)

  or    [CONSTRAINT symbol] FOREIGN KEY index_name (index_col_name,...)

  or    [CONSTRAINT symbol] FOREIGN KEY [index_name] (index_col_name,...)

            [reference_definition]

  or    CHECK (expr)










@@ -33073,7 +33073,7 @@ All mapped tables must be in the same database as the @code{MERGE} table.













@item















If you want to insert data in a @code{MERGE} table, you have to specify with















@code{INSERT_METHOD} into with table the row should be inserted.













@xref{MERGE}.













@xref{MERGE}.  This option was introduced in MySQL 4.0.0.





























@item















In the created table the @code{PRIMARY} key will be placed first, followed










@@ -46073,6 +46073,9 @@ able to use boolean fulltext search}.













@code{LOCATE()} and @code{INSTR()} are case sensitive if neither















argument is a binary string.















@item













Changed @code{RND()} initialization so that @code{RND(N)} and @code{RND(N+1)}













are more distinct.













@item















Fixed core dump bug in @code{UPDATE ... ORDER BY}.















@item















Changed @code{INSERT INTO .. SELECT} to stop on errors by default.









@@ -46083,6 +46086,8 @@ Added boolean fulltext search code. It should be considered early alpha.













@item















Extended @code{MODIFY} and @code{CHANGE} in @code{ALTER TABLE} to accept















the @code{AFTER} keyword.













@item













Index are now used with @code{ORDER} BY on a whole InnoDB table.















@end itemize





























@node News-4.0.0,  , News-4.0.1, News-4.0.x

























client/mysqltest.c



+3
−4






























Original line number
Diff line number
Diff line








@@ -1336,7 +1336,7 @@ int do_connect(struct st_query* q)













    con_db=db;















  if ((con_error = safe_connect(&next_con->mysql, con_host,















				con_user, con_pass,













			    con_db, con_port, *con_sock ? con_sock: 0)))













				con_db, con_port, con_sock ? con_sock: 0)))















    die("Could not open connection '%s': %s", con_name,















	mysql_error(&next_con->mysql));


























@@ -2403,7 +2403,6 @@ int main(int argc, char** argv)













      printf("ok\n");















  }





























  mysql_server_end();















  free_used_memory();















  exit(error ? 1 : 0);















  return error ? 1 : 0;				/* Keep compiler happy */

































libmysqld/WHITEPAPER
deleted100644 → 0



+0
−16






























Original line number
Diff line number
Diff line













LIBRARY VERSION DESIGN (EMBEDDED SERVER)









































- The library version of MySQL server is the client library that contains embedded server.



























- This client DLL has name : libmysqlclient_e (.la)



























- The client application that supposed to use MySQL LV need to be rebuilt against libmysqlclient_e.la. The rebuild process is necessary, because libmysqlclient_e is a LIBTOOL object, which has the different LIBS list compared to the original libmysqlclient.la.



























- The client and the server code run in the same process and the same thread;



























- The server code is invoked when client writes the command to the net, and when connection is established;















































































libmysqld/examples/test-run



+1
−0






























Original line number
Diff line number
Diff line








@@ -78,6 +78,7 @@ if test $clean = 1













then















  rm -f $datadir/ib_* $datadir/ibdata*















  rm -f $datadir/log.00*













  rm -f $datadir/test/*.db















fi















rm -f $datadir/../tmp/*















rm -f test-gdbinit

































mysql-test/r/innodb.result



+1
−1






























Original line number
Diff line number
Diff line








@@ -858,7 +858,7 @@ insert into test_$1.t3 values(1);













commit;















drop database test_$1;















show tables from test_$1;













Can't read dir of './test_$1/' (Errcode: 2)













Got one of the listed errors















create table t1 (a int not null) type= innodb;















insert into t1 values(1),(2);















truncate table t1;