database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-31 15:50:51 +03:00
Code Activity
62,929 Commits 3,251 Branches 1,092 Tags
c7fc8045cb15f7edc587b133337aa28bc1dd9cc5
Commit Graph

44 Commits

Author SHA1 Message Date
Alexey Kopytov
f10885675c Manual merge of mysql-trunk into mysql-trunk-merge. 
Conflicts:

Text conflict in client/mysqlbinlog.cc
Text conflict in mysql-test/Makefile.am
Text conflict in mysql-test/collections/default.daily
Text conflict in mysql-test/r/mysqlbinlog_row_innodb.result
Text conflict in mysql-test/suite/rpl/r/rpl_typeconv_innodb.result
Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
Text conflict in mysql-test/suite/rpl/t/rpl_row_create_table.test
Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test
Text conflict in mysql-test/suite/rpl/t/rpl_typeconv_innodb.test
Text conflict in mysys/charset.c
Text conflict in sql/field.cc
Text conflict in sql/field.h
Text conflict in sql/item.h
Text conflict in sql/item_func.cc
Text conflict in sql/log.cc
Text conflict in sql/log_event.cc
Text conflict in sql/log_event_old.cc
Text conflict in sql/mysqld.cc
Text conflict in sql/rpl_utility.cc
Text conflict in sql/rpl_utility.h
Text conflict in sql/set_var.cc
Text conflict in sql/share/Makefile.am
Text conflict in sql/sql_delete.cc
Text conflict in sql/sql_plugin.cc
Text conflict in sql/sql_select.cc
Text conflict in sql/sql_table.cc
Text conflict in storage/example/ha_example.h
Text conflict in storage/federated/ha_federated.cc
Text conflict in storage/myisammrg/ha_myisammrg.cc
Text conflict in storage/myisammrg/myrg_open.c
 2010-03-24 18:03:44 +03:00
Alexey Kopytov
4db97ede5b Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 
Conflicts:

Text conflict in client/mysqlbinlog.cc
Text conflict in mysql-test/r/explain.result
Text conflict in mysql-test/r/subselect.result
Text conflict in mysql-test/r/subselect3.result
Text conflict in mysql-test/r/type_datetime.result
Text conflict in sql/share/Makefile.am
 2010-03-12 12:51:53 +03:00
Georgi Kodinov
a774c83c2f Bug #35250: readline check breaks when doing vpath build 
MySQL uses two source layouts when building : the bzr 
layout and the source package layout.
The previous fix for bug 35250 contained 1 change that is
valid for both modes and a number of changes that are valid
only for the bzr source layout.
The important thing was to fix the source package layout.
And for this the change in configure.in was sufficient.
It's not trivial (and not requested by this bug) to support 
VPATH builds from the bzr trees.
This is why the other changes are reverted and the change to
fix the VPATH build for source distributions is left intact.
 2010-03-09 17:51:31 +02:00
Alexander Nozdrin
1913b715bc Manual merge from mysql-trunk-merge. 
Conflicts:
  - sql/share/Makefile.am
 2010-03-01 12:39:44 +03:00
Alexey Kopytov
031657c694 Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. 
Conflicts:

Text conflict in scripts/Makefile.am
Text conflict in sql/share/Makefile.am
 2010-02-26 16:06:31 +03:00
Georgi Kodinov
9947636bba Bug #35250: readline check breaks when doing vpath build 
Fixed several (obvious) places that don't work with vpath
build.
 2010-02-12 18:28:35 +02:00
Vladislav Vaintroub
17dd1b248a merge 2010-01-13 21:14:42 +01:00
Guilhem Bichot
284b836cd3 fixing wrong indentation in two Makefile.am, which prevented the Anjuta IDE from parsing the MySQL tree. 2010-01-06 11:27:35 +01:00
Vladislav Vaintroub
13cd7170cc WL#5161 : Cross-platform build with CMake 2009-11-09 12:32:48 +01:00
Sergey Glukhov
7741d9b50d WL#751 Error message construction, backport 2009-10-15 17:23:43 +05:00
kent@mysql.com/kent-amd64.(none)
226a5c833f Many files: 
Changed header to GPL version 2 only
 2006-12-23 20:17:15 +01:00
kent@mysql.com
b269caecb1 Additional "make distcheck" changes specific to 5.0 2005-11-09 11:56:04 +02:00
kent@mysql.com
4742f585b1 Merge 2005-11-04 02:17:11 +01:00
kent@mysql.com
095efe48a5 Makefile.am, configure.in: 
Enable "make distcheck" to work
 2005-09-24 15:51:45 +02:00
jimw@mysql.com
cf5dd176c0 Fix build using --without-server. (Bug #11680) 2005-08-23 11:25:24 -07:00
lenz@mysql.com
918ce29557 - manual merge 2005-04-21 08:30:59 +02:00
lenz@mysql.com
814b4aa2eb - manual merge 2005-04-19 17:18:56 +02:00
lenz@mysql.com
a42c7d442e - added missing copyright headers to several Makefile.am's (noticed 
while testing changes to the mysql-copyright scripts
 2005-04-19 17:00:05 +02:00
gbichot@quadita2.mysql.com
2b7ec71836 all-local instead of all (to not have double "all:" in Makefile) 2005-04-11 17:44:28 +02:00
gbichot@quadita2.mysql.com
f356fb08d6 In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end 
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile) (thx Serg).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile (thx Konstantin).
 2005-04-11 17:37:49 +02:00
serg@serg.mylan
852f2e0aba small Makefile.am cleanup 
clean: targets removed
    generated *.h files moved to include/
 2005-01-28 17:14:03 +01:00
lenz@mysql.com
750f3937d7 - typo fix 2004-12-17 18:00:05 +01:00
lenz@mysql.com
63534a3d98 - make sure to include sql/share/errmsg.txt into the source distribution 2004-12-17 17:46:46 +01:00
anjuta@arthur.local
f9451974be WL#1051, more maintanable error messages. 2004-12-13 22:51:54 +02:00
bar@bar.mysql.r18.ru
731b8392ee Charset number is now stored into error.sys by comp_err and loaded by mysqld. 2003-09-17 16:22:58 +05:00
bar@bar.mysql.r18.ru
4e405fa200 koi8_ru -> koi8_r 
charset.conf -> charset.xml
bug fix
 2003-01-05 17:34:24 +04:00
bar@bar.mysql.r18.ru
c9000c247c Charset index is sotred in XML now 2003-01-03 14:35:32 +04:00
monty@hundin.mysql.fi
727e507bca merge with 3.23.50 2002-03-27 01:56:10 +02:00
monty@hundin.mysql.fi
21a6366935 Fixed typo 2002-03-26 01:33:41 +02:00
monty@hundin.mysql.fi
9ab2496b1d Fix for compilation on fast machine 2002-03-26 01:31:26 +02:00
monty@tik.mysql.fi
b13d453d50 Fix UNION 
New faster list iterators
Change list code to be simpler and faster
Optimize count(distinct)
New error messages for UNION
Make create_tmp_table more general to be usable by UNION
 2001-08-02 06:29:50 +03:00
monty@donna.mysql.com
dccba43687 Fixed installation bug in Makefile 2001-02-06 23:47:54 +02:00
monty@donna.mysql.com
591997d3b9 Install charsets/README 2001-02-06 23:09:12 +02:00
monty@donna.mysql.com
79ec0059ae Fixed typo in Makefile 2001-02-06 19:59:57 +02:00
tim@threads.polyesthetic.msg
a508cd8f32 Remove several uses of cp -a, and fix broken dist-hook in sql-bench. 2001-02-05 21:58:20 -05:00
monty@donna.mysql.com
728b63e0de Workaround for bug in thread library in Unixware 7 
Fixed bug in GROUP BY on ELT()
Added SEQUENCE() to UDF examples
 2001-02-03 18:00:29 +02:00
tim@threads.polyesthetic.msg
faeb9896bd Use $(INSTALL_DATA) instead of cp -p in mysql-test and sql-bench. 
Clean up $(INSTALL_DATA) use in sql/share.
 2001-01-31 15:01:16 -05:00
tim@donna.mysql.com
5f4a3f5167 Handle AVAILABLE_LANGUAGES more portably. 
Fix a typo in BDB configuration.
 2001-01-16 21:36:43 +02:00
serg@hynda.mysql.fi
db29ac337d Makefile.am rules for */errmsg.sys refined 2001-01-14 12:56:44 +02:00
serg@serg.mysql.com
c857519a2f Makefile.am create */errmsg.sys during build, not install 
Delete: sql/share/spanish/errmsg.sys	sql/share/swedish/errmsg.sys
	sql/share/slovak/errmsg.sys	sql/share/polish/errmsg.sys
	sql/share/romanian/errmsg.sys	sql/share/russian/errmsg.sys
	sql/share/portuguese/errmsg.sys	sql/share/hungarian/errmsg.sys
	sql/share/italian/errmsg.sys	sql/share/japanese/errmsg.sys
	sql/share/korean/errmsg.sys	sql/share/greek/errmsg.sys
	sql/share/czech/errmsg.sys	sql/share/danish/errmsg.sys
	sql/share/dutch/errmsg.sys	sql/share/english/errmsg.sys
	sql/share/estonian/errmsg.sys	sql/share/french/errmsg.sys
	sql/share/german/errmsg.sys
post-commit	adapted for bk-2.0beta5
 2001-01-07 14:51:04 +01:00
monty@donna.mysql.com
50486eeb80 Fixes for MyISAM and packed keys + AIX 2000-09-22 01:46:26 +03:00
jcole@ham.spaceapes.com
e6c278bef7 Fixed a problem with installing, for IRIX 'install', paths would 
be wrong and install would fail.
 2000-09-14 00:33:16 +00:00
serg@infomag.ape.relarn.ru
5886090182 PART I: Keys support for MyMERGE tables 
myisammrg/             |
Makefile.am            |
mymrgdef.h             |   support for keys
myrg_open.c            |          &
myrg_queue.c           |   bugfixes
myrg_rfirst.c          |
myrg_rkey.c            |
myrg_rlast.c           |
myrg_rnext.c           |
myrg_rprev.c           |
myrg_rrnd.c            |

include/myisammrg.h    | rkey/rnext/etc prototyped

sql/                   |
ha_myisammrg.cc        | support for keys
ha_myisammrg.h         |

myisam/                |
mi_rkey.c              | buf==NULL extension, _mi_rkey()
mi_rnext.c             |
mi_rprev.c             |

include/queues.h       | reinit_queue() - same as init_queue, but w/o malloc
mysys/queues.c         |

PART II: Miscellaneous

myisam/common_words    | deleted (looks like I checked it in by mistake)

some files (like acconfig.h, Makefile.am, COPYING.LIB, etc)
                       | Change mode to -rw-r--r-- (by `chmod a-x ')
 2000-08-14 15:27:19 +04:00
bk@work.mysql.com
f4c589ff6c Import changeset 2000-07-31 21:29:14 +02:00