unknown 93fdb082a2 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint ...

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

2007-11-06 11:07:30 +01:00

..

.cvsignore

…

client_priv.h

Fix compile warnings.

2007-09-29 23:31:08 +04:00

CMakeLists.txt

Bug#29903 The CMake build method does not produce the embedded library.

2007-08-03 14:43:12 -04:00

completion_hash.cc

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

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

completion_hash.h

my_strtoll10-x86.s:

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

echo.c

echo.c:

2007-03-20 18:31:49 +01:00

get_password.c

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

2006-12-23 20:20:40 +01:00

Makefile.am

Manual merge: Makefile lines must start with tab, not blank.

2007-05-02 14:16:21 +02:00

my_readline.h

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

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

mysql_upgrade.c

Merge alf.(none):/src/bug28774/my50-bug28774

2007-10-08 22:32:26 -04:00

mysql.cc

Merge sita.local:/Users/tsmith/m/bk/51

2007-09-24 11:37:26 +02:00

mysqladmin.cc

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint

2007-09-15 05:12:02 +02:00

mysqlbinlog.cc

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint

2007-09-15 05:12:02 +02:00

mysqlcheck.c

Merge mysql.com:/home/ram/work/mysql-5.1-maint

2007-10-31 11:40:53 +04:00

mysqldump.c

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

2007-10-08 17:46:14 -04:00

mysqlimport.c

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint

2007-09-15 05:12:02 +02:00

mysqlshow.c

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint

2007-09-15 05:12:02 +02:00

mysqlslap.c

Discovered a bug while working with backup. Since it is possible to execute a statement in a pre/post statment clause that can return a result, we need to test for that and free it.

2007-09-04 20:03:12 -07:00

mysqltest.c

Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint

2007-11-06 11:07:30 +01:00

readline.cc

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

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

sql_string.cc

Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris

2007-08-13 16:11:25 +03:00

sql_string.h

Fixed compiler warnings

2007-02-23 13:13:55 +02:00