Commit 89ac8682 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Merge work:/home/bk/mysql-4.0 

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
parents d725abf1 60fc6764

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ paul@teton.kitebird.com 
root@x3.internalnet

sasha@mysql.sashanet.com

serg@serg.mysql.com

tim@black.box

tim@hundin.mysql.fi

tim@threads.polyesthetic.msg

tim@white.box

include/mysql.h

+15 −5
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,

   MA 02111-1307, USA */



/* defines for the libmysql library */



#ifndef _mysql_h

#define _mysql_h
@@ -222,6 +220,20 @@ typedef struct st_mysql_res { 
  my_bool	eof;			/* Used my mysql_fetch_row */

} MYSQL_RES;





/* Set up and bring down the server; to ensure that applications will

 * work when linked against either the standard client library or the

 * embedded server library, these functions should be called. */

void mysql_server_init(int argc, char **argv, const char **groups);

void mysql_server_end();



/* Set up and bring down a thread; these function should be called

 * for each thread in an application which opens at least one MySQL

 * connection.  All uses of the connection(s) should be between these

 * function calls. */

my_bool mysql_thread_init();

void mysql_thread_end();



/* Functions to get information from the MYSQL and MYSQL_RES structures */

/* Should definitely be used if one uses shared libraries */
@@ -359,15 +371,13 @@ unsigned int STDCALL mysql_thread_safe(void); 


#define mysql_reload(mysql) mysql_refresh((mysql),REFRESH_GRANT)



#ifndef USE_OLD_FUNCTIONS

#ifdef USE_OLD_FUNCTIONS

MYSQL *		STDCALL mysql_connect(MYSQL *mysql, const char *host,

				      const char *user, const char *passwd);

int		STDCALL mysql_create_db(MYSQL *mysql, const char *DB);

int		STDCALL mysql_drop_db(MYSQL *mysql, const char *DB);

#endif



/* new api functions */



#define HAVE_MYSQL_REAL_CONNECT



#ifndef MYSQL_SERVER

libmysql/libmysql.c

+22 −0
Original line number Diff line number Diff line
@@ -94,6 +94,28 @@ static sig_handler pipe_sig_handler(int sig); 
static ulong mysql_sub_escape_string(CHARSET_INFO *charset_info, char *to,

				     const char *from, ulong length);



void mysql_server_init(int argc __attribute__((unused)),

                      char **argv __attribute__((unused)),

                      const char **groups __attribute__((unused))) {}



void mysql_server_end() {}



my_bool mysql_thread_init()

{

#ifdef THREAD

    return my_thread_init();

#else

    return 0;

#endif

}



void mysql_thread_end()

{

#ifdef THREAD

    my_thread_end();

#endif

}



/*

  Let the user specify that we don't want SIGPIPE;  This doesn't however work

  with threaded applications as we can have multiple read in progress.

libmysqld/Makefile.am

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ INCLUDES = @MT_INCLUDES@ @bdb_includes@ -I$(srcdir)/../include -I../include \ 
LDADD =				@CLIENT_EXTRA_LDFLAGS@ libmysqld.la

pkglib_LTLIBRARIES =		libmysqld.la



libmysqld_la_SOURCES = libmysqld.c lib_sql.cc

libmysqld_la_SOURCES = libmysqld.c lib_sql.cc lib_load.cc



libmysqlsources = errmsg.c get_password.c password.c

## XXX: we should not have to duplicate info from the sources list
@@ -50,7 +50,7 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \ 
	opt_sum.cc procedure.cc records.cc slave.cc sql_acl.cc \

	sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \

	sql_crypt.cc sql_db.cc sql_delete.cc sql_insert.cc sql_lex.cc \

	sql_list.cc sql_load.cc sql_manager.cc sql_map.cc sql_parse.cc \

	sql_list.cc sql_manager.cc sql_map.cc sql_parse.cc \

	sql_rename.cc sql_repl.cc sql_select.cc sql_show.cc \

	sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \

	sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \
@@ -68,7 +68,7 @@ sqlobjects = convert.lo derror.lo field.lo field_conv.lo filesort.lo \ 
	opt_sum.lo procedure.lo records.lo slave.lo sql_acl.lo \

	sql_analyse.lo sql_base.lo sql_cache.lo sql_class.lo \

	sql_crypt.lo sql_db.lo sql_delete.lo sql_insert.lo sql_lex.lo \

	sql_list.lo sql_load.lo sql_manager.lo sql_map.lo sql_parse.lo \

	sql_list.lo sql_manager.lo sql_map.lo sql_parse.lo \

	sql_rename.lo sql_repl.lo sql_select.lo sql_show.lo \

	sql_string.lo sql_table.lo sql_test.lo sql_udf.lo \

	sql_update.lo sql_yacc.lo table.lo thr_malloc.lo time.lo \

libmysqld/README

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
LIBRARY (ONE_PROCESS VERSION) OF MYSQL CLIENT



Installation steps:





1) unpack mysql-3.23.27-beta.tar tarball source version (get from www.mysql.com.sg)

2) patch  mysql-3.23.27-beta with lbver-3.23.27-beta.diff:

   patch -p0 <lbver-3.23.27-beta.diff

3) cd mysql-3.23.27-beta 

4) autoconf

7) ./configure --prefix=/usr/local/mysql --with-library-version

8) make  	

9) make install  	(should have the root privileges)

10)mkdir /usr/local/mysql/var (if not already)

15) cd ../client

19) ./mysql   (start libarary version mysql)

mysql> create database db1;

mysql> use db1;

mysql> create table a123(i integer)

...... now you can work with library version....