unknown f1e6d23944 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 ...

into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge


BitKeeper/etc/ignore:
  auto-union
client/mysqltest.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

2006-09-14 23:53:35 +04: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

Merge production.mysql.com:/usersnfs/rburnett/tmp_merge2

2006-09-06 18:27:26 +02:00

libmysqld.rc

query_id and my_xid -> ulonglong

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

Makefile.am

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

2006-09-14 23:53:35 +04:00

resource.h

query_id and my_xid -> ulonglong

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