unknown 70cb41a240 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt ...

into  mysql.com:/misc/mysql/31177/51-31177


client/mysql.cc:
  Auto merged
mysql-test/r/index_merge_myisam.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/type_bit.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged

2007-12-02 03:19:07 +01:00

..

.cvsignore

Import changeset

2000-07-31 21:29:14 +02:00

client_priv.h

after merge fix

2007-10-04 15:35:45 +05: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 tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt

2007-12-02 03:19:07 +01: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 lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base

2007-10-18 16:57:51 -06:00

mysqldump.c

Bug#31113 mysqldump 5.1 can't handle a dash ("-") in database names

2007-11-02 12:24:45 +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

Fixed bug #29985.

2007-09-17 21:39:07 +05:00

mysqltest.c

Merge mysql.com:/misc/mysql/31177/50-31177

2007-12-01 15:53:56 +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