unknown 58935a314e Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime ...

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
BitKeeper/deleted/.del-ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_error.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/show_check.result:
  Manual merge.
mysql-test/t/show_check.test:
  Manual merge.
sql/item.h:
  Manual merge.
sql/sp.cc:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.

2007-07-02 01:55:01 +04:00

..

.cvsignore

…

auto_increment.res

…

auto_increment.tst

…

big_record.pl

…

CMakeLists.txt

Many files:

2006-12-31 02:29:11 +01:00

connect_test.c

Many files:

2006-12-23 20:17:15 +01:00

deadlock_test.c

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

drop_test.pl

…

export.pl

…

fork2_test.pl

…

fork_big2.pl

This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work.

2006-02-12 13:26:30 -08:00

fork_big.pl

This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work.

2006-02-12 13:26:30 -08:00

function.res

…

function.tst

…

grant.pl

…

grant.res

…

index_corrupt.pl

…

insert_and_repair.pl

…

insert_test.c

Many files:

2006-12-23 20:17:15 +01:00

list_test.c

Many files:

2006-12-23 20:17:15 +01:00

lock_test.pl

…

lock_test.res

…

mail_to_db.pl

This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work.

2006-02-12 13:26:30 -08:00

Makefile.am

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

2007-03-19 11:15:59 +01:00

myisam-big-rows.tst

…

mysql_client_test.c

Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime

2007-07-02 01:55:01 +04:00

pmail.pl

…

rename_test.pl

…

restore-lock.smack

…

select_test.c

Many files:

2006-12-23 20:17:15 +01:00

showdb_test.c

Many files:

2006-12-23 20:17:15 +01:00

ssl_test.c

Many files:

2006-12-23 20:17:15 +01:00

table_types.pl

…

test_delayed_insert.pl

…

thread_test.c

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

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

truncate.pl

…