unknown 6da3c0facc Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl ...

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_insert.test:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.h:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged

2007-06-18 12:10:36 +02:00

..

.cvsignore

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

CMakeLists.txt

Embedded Server doesn't build on Windows.

2007-06-15 14:32:16 -04:00

ha_myisammrg.cc

Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines

2007-06-14 16:19:47 +05:00

ha_myisammrg.h

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl

2007-06-18 12:10:36 +02:00

make-ccc

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

Makefile.am

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

myrg_close.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

myrg_create.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

myrg_def.h

Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines

2007-06-07 13:53:23 +05:00

myrg_delete.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

myrg_extra.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

myrg_info.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

myrg_locking.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

myrg_open.c

Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines

2007-06-07 13:53:23 +05:00

myrg_panic.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

myrg_queue.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

myrg_range.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

myrg_rfirst.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

myrg_rkey.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

myrg_rlast.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

myrg_rnext_same.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

myrg_rnext.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

myrg_rprev.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

myrg_rrnd.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

myrg_rsame.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

myrg_static.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

myrg_update.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

myrg_write.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

plug.in

bug #23369 (Embedded library can't be linked)

2006-10-18 17:03:37 +05:00