mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-24 09:15:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Manual merge from mysql-trunk.

Browse source 
Conflicts:
  - mysql-test/r/partition.result
  - mysql-test/r/variables_debug.result
  - mysql-test/t/partition.test
  - mysql-test/t/variables_debug.test
This commit is contained in:
Alexander Nozdrin 2010-05-20 16:35:28 +04:00
commit dabd4a1c55
149 changed files with 1359 additions and 1183 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sql-common/Makefile.am
View file

@ -15,6 +15,3 @@
## Process this file with automake to create Makefile.in
EXTRA_DIST = client.c pack.c my_time.c my_user.c
# Don't update the files from bitkeeper
%::SCCS/s.%