Alexander Nozdrin 5244303ac9 Manual merge from mysql-next-mr. ...

Conflicts:
  - mysys/charset.c
  - mysys/my_thr_init.c

2009-12-17 23:02:52 +03:00

..

client_priv.h

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

CMakeLists.txt

Backport http://lists.mysql.com/commits/57778

2009-09-30 15:35:01 +02: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

fixes for build failures due to my yesterday's changeset forbidding

2008-02-19 18:45:11 +01:00

Makefile.am

BUG#48048: Deprecated constructs need removal in Betony

2009-11-13 12:14:38 +00:00

my_readline.h

WL#5016: Fix header file include guards

2009-09-23 23:32:31 +02:00

mysql_upgrade.c

Manual merge from mysql-trunk-merge.

2009-12-16 21:02:21 +03:00

mysql.cc

Manual merge from mysql-trunk-merge.

2009-12-12 23:38:59 +03:00

mysqladmin.cc

Manual merge/pull from mysql-next-mr.

2009-11-25 18:03:05 +03:00

mysqlbinlog.cc

Manual merge from mysql-next-mr.

2009-12-02 18:50:14 +03:00

mysqlcheck.c

Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc

2009-12-11 01:58:13 -07:00

mysqldump.c

Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc

2009-12-11 01:58:13 -07:00

mysqlimport.c

Manual merge/pull from mysql-next-mr.

2009-11-25 18:03:05 +03:00

mysqlshow.c

merging.

2009-11-17 15:27:40 +04:00

mysqlslap.c

Manual merge/pull from mysql-next-mr.

2009-11-25 18:03:05 +03:00

mysqltest.cc

Manual merge/pull from mysql-next-mr.

2009-11-25 18:03:05 +03:00

readline.cc

This is the downport of

2009-09-11 22:26:35 +02:00

sql_string.cc

Backport of:

2009-11-24 16:54:59 +03:00

sql_string.h

Bug #33544 UDF_INIT member decimals initialized wrong with

2009-11-11 21:19:41 +01:00