mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 09:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
59490 commits 2780 branches 343 tags 1.6 GiB
Commit graph

59490 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vladislav Vaintroub
94659ffbb1 do not use -z defs on Solaris, it complains about libc.so implicit dependency 2009-12-07 01:50:54 +00:00
Vladislav Vaintroub
9fcef3c45b On Linux, support -Wl,--no-undefined (only client shared library) 
and --Wl,--as-needed (all shared modules). The later will remove
unused dependencies (also from gcc and C++ runtime)
 2009-12-07 02:16:05 +01:00
Vladislav Vaintroub
2e62703114 set version and soversionn for client shared library 2009-12-05 19:59:13 +01:00
Vladislav Vaintroub
92642d0639 fdatasync is not documented on Snow Leopard and is not in unistd.h 
CMake finds it as it is expored by system libraries, though attempts to
use it will result bring a warning. Fix by using CHECK_SYMBOL_EXISTS
instead of CHECK_FUNCTION_EXISTS
 2009-12-05 16:15:17 +01:00
Vladislav Vaintroub
f03eed1536 merge 2009-12-05 13:17:58 +00:00
Vladislav Vaintroub
04d2adbd4f Fix creation of exports file on Unix 2009-12-05 13:16:30 +00:00
Vladislav Vaintroub
56e4fc4b00 Fix my_atomic.h on Solaris, do not redefine macros already defined 
in include/atomic/solaris.h
 2009-12-05 04:14:48 +01:00
Vladislav Vaintroub
a426f50f5c merge 2009-12-04 20:05:04 +00:00
Marc Alff
560e76c567 Merge mysql-next-mr (revno 2937) --> mysql-next-mr-marc 2009-12-03 02:57:30 -07:00
Vladislav Vaintroub
131d1e6fdd merge 2009-12-02 22:16:33 +01:00
Marc Alff
203d9f1eab Merge mysql-next-mr (revno 2927) --> mysql-next-mr-marc 2009-12-02 11:36:20 -07:00
Vladislav Vaintroub
f8eeb566ae Fix "command install() is not scriptable" cmake error 2009-12-02 17:17:14 +01:00
Alexander Nozdrin
20b95d0831 Auto-merge from mysql-next-mr. 2009-12-02 19:00:26 +03:00
Andrei Elkin
0eda48463c Manual resolving for the following files 
Text conflict in mysql-test/collections/default.experimental
Text conflict in mysql-test/r/show_check.result
Text conflict in mysql-test/r/sp-code.result
Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result
Text conflict in mysql-test/suite/rpl/t/disabled.def
Text conflict in mysql-test/t/show_check.test
Text conflict in mysys/my_delete.c
Text conflict in sql/item.h
Text conflict in sql/item_cmpfunc.h
Text conflict in sql/log.cc
Text conflict in sql/mysqld.cc
Text conflict in sql/repl_failsafe.cc
Text conflict in sql/slave.cc
Text conflict in sql/sql_parse.cc
Text conflict in sql/sql_table.cc
Text conflict in sql/sql_yacc.yy
Text conflict in storage/myisam/ha_myisam.cc

Corrected results for
 stm_auto_increment_bug33029.reject      2009-12-01
		20:01:49.000000000 +0300
       <andrei> @@ -42,9 +42,6 @@
       <andrei>  RETURN i;
       <andrei>  END//
       <andrei>  CALL p1();
       <andrei> -Warnings:
       <andrei> -Note   1592    Statement may not be safe to log in statement
		format.
       <andrei> -Note   1592    Statement may not be safe to log in statement
		format.

There should be indeed no Note present because there is in fact autoincrement 
top-level query in sp() that triggers inserting in yet another auto-inc table.
(todo: alert DaoGang to improve the test).
 2009-12-01 21:07:18 +02:00
Vladislav Vaintroub
1407b6f1ec fix build errors 2009-12-01 18:28:13 +00:00
Alexander Nozdrin
273454b969 A patch for Bug#48915 (After having switched off the ipv6 support in OS, 
mysqld crashed in network_init()).

The problem was that current_thd was not ready at that point in mysqld life,
so ER() macro could not be used.

The fix is to use ER_DEFAULT() macro, which is intented for such cases.
 2009-12-01 19:59:31 +03:00
Vladislav Vaintroub
8b90176a47 in RESTRICT_SYMBOL_EXPORTS,handle cases where COMPILE_FLAGS are not set 
(COMPILE_FLAGS-NOTFOUND)
 2009-12-01 14:35:09 +01:00
Vladislav Vaintroub
60a3d30086 fix make dist errors 2009-12-01 14:18:53 +01:00
Vladislav Vaintroub
d2139f3135 - Introduce MYSQL_ADD_PLUGIN that replaces MYSQL_STORAGE_ENGINE 
- Fix semisync library prefix (remove lib on Unixes)
- restrict exported symbols from zlib and yassl (fvisibility=hidden)
 2009-12-01 12:00:50 +01:00
Marc Alff
f2d67abbc0 WL#2360 Performance schema 
Part 1: Instrumentation interface
 2009-11-30 17:49:15 -07:00
Andrei Elkin
80cb81069b fixing the prev "auto"-merge that carried a piece of deprecated code (existing in 5.1) 2009-11-30 18:07:33 +02:00
Andrei Elkin
3962da934f merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091104182209-iui387z35159aoyw 2009-11-30 14:34:39 +02:00
Horst.Hunger
f9837a17c7 fix for ipv6. 2009-11-30 10:49:37 +01:00
Vladislav Vaintroub
43770e8f3f merge 2009-11-30 01:49:26 +00:00
Serge Kozlov
13dad4ebd2 WL#3894, post-push fix. 2009-11-28 17:53:48 +03:00
Serge Kozlov
11faf99c29 Backport for WL#3894 2009-11-28 02:34:47 +03:00
Horst.Hunger
940b876e24 last fix? 2009-11-27 17:37:39 +01:00
Horst.Hunger
373c18df9b another patch to fix differences. 2009-11-27 13:08:38 +01:00
Horst.Hunger
37771cb78e No more socket and no more diffs in result files. 2009-11-27 09:02:32 +01:00
Serge Kozlov
9e3b092c92 Backport for WL#4416 2009-11-27 02:32:01 +03:00
Vladislav Vaintroub
50d56f0906 Delay configuring scripts like mysql_install_db until CPack runs 
(to handle DESTDIR correctly)
 2009-11-26 18:40:45 +01:00
Horst.Hunger
ae6c0509f5 Forgotten to add the windows version of the tests. Done with that patch. 2009-11-26 13:03:36 +01:00
Horst.Hunger
88eeaa05de Improvements to reduce the output for better reading and more stability. 2009-11-26 09:03:04 +01:00
Vladislav Vaintroub
3093ea058c Fix universal binaries build on OSX, in case both 32 and 64 bit architectures are used 2009-11-26 00:47:38 +01:00
Vladislav Vaintroub
ac0b20488e merge 2009-11-25 15:44:07 +01:00
Vladislav Vaintroub
68cfabcc10 merge 2009-11-25 15:20:14 +01:00
Alexander Nozdrin
1792de0af9 Update result files. 2009-11-25 17:12:30 +03:00
Alexander Nozdrin
3c11750e36 Auto-merge from mysql-next-mr. 2009-11-25 16:46:45 +03:00
Alik
d19168a962 Fix typo (s/_WIN_/__WIN__). 2009-11-25 15:58:15 +03:00
Alexander Nozdrin
7eb84da890 Backport of WL#798 (MySQL IPv6 support) from 6.0. 
The following 6.0 revisions were analyzed:
  - sp1r-brian@zim.(none)-20071228102738-21894
  - sp1r-brian@zim.(none)-20071228121841-56447
  - sp1r-brian@zim.(none)-20071228205403-56423
  - sp1r-brian@zim.(none)-20071228221139-55341
  - sp1r-brian@zim.(none)-20071228233443-55352
  - sp1r-brian@zim.(none)-20071229094527-61763
  - sp1r-brian@zim.(none)-20071230203739-61746
  - sp1r-brian@zim.(none)-20080102213805-61741
  - sp1r-brian@zim.(none)-20080103201041-61746
  - sp1r-brian@zim.(none)-20080104234927-59875
  - sp1r-brian@zim.(none)-20080105005827-59874
  - sp1r-brian@zim.(none)-20080105012020-59865
  - sp1r-brian@zim.(none)-20080106003858-59857
  - sp1r-brian@zim.(none)-20080123195552-31680
  - sp1r-brian@zim.(none)-20080124201848-29999
  - sp1r-brian@zim.(none)-20080129075144-36991
  - sp1r-cbell/Chuck@mysql_cab_desk.-20080215041806-21954
  - sp1r-vvaintroub@wva.-20080212124547-06272
  - sp1r-dfischer/mysqldev@mysql.com/production.mysql.com-20071223184258-15140
  - sp1r-brian@zim.(none)-20080206122216-35774
  - sp1r-baker@bk-internal.mysql.com-20080209005622-35947
  - sp1r-baker@bk-internal.mysql.com-20080224215608-24613
  - sp1r-baker@bk-internal.mysql.com-20080307170710-63543
  - sp1r-baker@bk-internal.mysql.com-20080312233205-13069
  - sp1r-Reggie@core.-20080402175211-28643
  - kpettersson@mysql.com-20080901101150-4ne74r8v0492vv42
  - alik@sun.com-20090805173811-9fzt0ymcp9tsvn7k
  - alik@sun.com-20090805173937-fcv1fdveodq5x9gb
  - alik@sun.com-20090805175009-g1od16i3t1xkw2qr
  - kostja@sun.com-20090805200643-j9i4fy7ii8ijho5c
  - alik@sun.com-20090807195303-j4fb5m4l1dgdahwo
  - alik@sun.com-20090808114848-3rkzr9kifrijzaqy
  - alik@sun.com-20090810041739-ugmx34h34uid8mox
  - alik@sun.com-20090810105306-rf43rfyzzblsy5e7
  - alik@sun.com-20090810123113-ccdjwai68b5woqdm
  - alik@sun.com-20090811080423-gb7pibec1znaydzy
  - alik@sun.com-20090811082130-5uckar1vx3kdsw7g
  - alik@sun.com-20090812202051-uqkfwwxxcjvo5ean

The following bugfixes are also backported within this patch:
  - Bug#34292: netdb.h missing in hostname.cc
  - Bug#39153: Failing to lookup a host name can lead to crash
    in current IPv6 implementation
  - Bug#38247: Server does not resolve connecting ip's
  - Bug#43006: main.skip_name_resolve fails on Windows in PB2
  - Bug#45606: ACL requires IPv4-mapped addresses to be used
  - Bug#45584: Host name cache does not work as a cache
 2009-11-25 13:53:23 +03:00
Alexander Nozdrin
027a2fff15 Auto-merge from mysql-next-mr-runtime. 2009-11-25 13:47:01 +03:00
Vladislav Vaintroub
20438eadb4 - move ADD_SUBDIRECTORY(extra) outside of WITHOUT_SERVER 
- add INSTALL to shared client library
 2009-11-25 07:28:45 +01:00
Vladislav Vaintroub
39a158221d add --disable-shared equivalent 
fix mtr (empty argument passed to mysqld)
 2009-11-25 05:13:51 +01:00
Vladislav Vaintroub
23cd3cec41 Remove STATIC from ADD_CONVENIENCE_LIBRARY on 2 places 2009-11-25 02:11:01 +01:00
Vladislav Vaintroub
c65a38709f fix EXTRA_DIST crap 2009-11-25 01:55:47 +01:00
Vladislav Vaintroub
9ce3dae667 merge 2009-11-25 01:50:10 +01:00
Marc Alff
e2a34cbf70 WL#2373 Use cycle counter for timing 2009-11-24 16:36:31 -07:00
Vladislav Vaintroub
7377c50cb4 implement convenience libraries 2009-11-24 23:15:47 +00:00
Alexander Nozdrin
be0add42f5 Auto-merge from mysql-next-mr. 2009-11-24 22:39:05 +03:00
Konstantin Osipov
932a2751a4 Backport of: 
------------------------------------------------------------
revno: 3559
committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
branch nick: mysql-pe
timestamp: Fri 2009-08-28 15:23:16 -0300
message:
Break down a large and obnoxious "if" statement. Multiple "if" statements
makes it easy to understand and follow the code (specially in a debugger).

sql/sql_base.cc:
  Break down a large and obnoxious "if" statement. Multiple "if" statements
  makes it easy to understand and follow the code (specially in a debugger).
 2009-11-24 21:55:16 +03:00