unknown e454fb0c9d Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 ...

into  zim.(none):/home/brian/mysql/arch-5.1


BUILD/compile-alpha-cxx:
  Auto merged
BUILD/compile-alpha-debug:
  Auto merged
BUILD/compile-dist:
  Auto merged
BUILD/compile-ia64-debug-max:
  Auto merged
CMakeLists.txt:
  Auto merged
client/mysql.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
BUILD/FINISH.sh:
  Innodbase config still needed.

2006-08-25 14:07:30 -07:00

..

examples

Re-apply missing changeset, orignally pushed by elliot

2006-06-06 14:21:07 +03:00

CMakeLists.txt

fix for windows build

2006-08-24 22:10:55 -07:00

copyright

Added all changes from old 4.0 version:

2001-04-11 13:04:03 +02:00

emb_qcache.cc

Fixes to embedded server to be able to run tests with it

2006-02-24 18:34:15 +02:00

emb_qcache.h

Fix crash in embedded server due to incorrect storage of results

2005-03-31 19:17:45 -08:00

embedded_priv.h

Merge mysql.com:/home/hf/work/mysql-4.1.mrg

2006-07-18 14:52:29 +05:00

lib_sql.cc

Many files:

2006-08-21 15:34:29 +02:00

libmysqld.c

merging

2006-07-18 16:43:39 +05:00

libmysqld.def

Backport fix for mysql client not using SSl library directly

2006-04-22 00:48:13 +02:00

libmysqld.rc

query_id and my_xid -> ulonglong

2005-01-27 22:38:56 +01:00

Makefile.am

This changeset moves the ha_myisam files to their storage directories. It also includes updates for all engines include patch for windows builds.

2006-08-19 17:38:42 -07:00

resource.h

query_id and my_xid -> ulonglong

2005-01-27 22:38:56 +01:00