mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45738 commits 2781 branches 343 tags 1.6 GiB
Commit graph

45738 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
e208964bc8 Post Merge Correction 2007-04-23 21:47:21 -04:00
unknown
7f2b829cad Merge recycle.(none):/src/bug24732/my50-bug24732 
into  recycle.(none):/src/bug24732/my51-bug24732


BitKeeper/deleted/.del-Makefile.am~2:
  Auto merged
 2007-04-23 21:44:50 -04:00
unknown
6f6f68066b Bug#24732 Executables do not include Vista manifests 
- Correct PushBuild failure.


win/Makefile.am:
  Bug#24732 Executables do not include Vista manifests
  - Make sure new files are included in make dist builds.
 2007-04-23 21:43:36 -04:00
unknown
0ec5bd1c09 Merge recycle.(none):/src/mysql-5.1-maint 
into  recycle.(none):/src/mysql-5.1-maint_25141


sql/sql_table.cc:
  Auto merged
 2007-04-23 17:04:24 -04:00
unknown
809a28d45e Merge recycle.(none):/src/mysql-5.1-maint 
into  recycle.(none):/src/mysql-5.1-maint_27691
 2007-04-23 16:46:17 -04:00
unknown
142dbcd7a4 Bug #27691 bk compilation with VC++ 2005 fails 
- Added appropiate casts.


sql/log_event.cc:
  Bug #27691 bk compilation with VC++ 2005 fails
  - Add appropiate casts.
 2007-04-23 16:42:57 -04:00
unknown
06d3bda2aa Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  recycle.(none):/src/bug24732/my51-bug24732
 2007-04-23 16:35:20 -04:00
unknown
7ad5d7c1ef Bug#24732 Executables do not include Vista manifests 
- Post merge cleanup.


CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Added logic for EMBED_MANIFESTS configuration option.
client/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for client executables.
extra/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for my_print_default executable.
libmysql/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for myTest executable.
server-tools/instance-manager/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for mysqlmanager executable.
sql/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for mysqld executable.
storage/myisam/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for myisam executables.
win/README:
  Bug#24732 Executables do not include Vista manifests
  - Added new configuration option documentation.
win/configure.js:
  Bug#24732 Executables do not include Vista manifests
  - Added new EMBED_MANIFESTS configuration option.
 2007-04-23 16:23:32 -04:00
unknown
917f89ceb6 Merge recycle.(none):/src/bug24732/my50-bug24732 
into  recycle.(none):/src/bug24732/my51-bug24732


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~10:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~13:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~c20dcd005f596740:
  Auto merged
BitKeeper/deleted/.del-README~1:
  Auto merged
BitKeeper/deleted/.del-configure.js:
  Auto merged
 2007-04-23 15:47:26 -04:00
unknown
1ce0d7c63b Bug#24732 Executables do not include Vista manifests 
- Added script to generate application specific manifest.
- Added new CMake MACRO to add customer build events which will first
generate a manifest and then embeds that manifest into an executable.


BitKeeper/etc/ignore:
  Bug#24732 Executables do not include Vista manifests
  - Revise ignore rules to disallow auto-generated cmake files but to allow
  custom macros defined in a .cmake file.
CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Added logic for EMBED_MANIFESTS configuration option.
client/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for client executables.
extra/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for my_print_default executable.
libmysql/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for myTest executable.
myisam/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for myisam executables.
server-tools/instance-manager/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for mysqlmanager executable.
sql/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for mysqld executable.
win/README:
  Bug#24732 Executables do not include Vista manifests
  - Added new configuration option documentation.
win/configure.js:
  Bug#24732 Executables do not include Vista manifests
  - Added new EMBED_MANIFESTS configuration option.
win/create_manifest.js:
  Bug#24732 Executables do not include Vista manifests
  - Manifest generator.  This script generates a basic manifest.
win/mysql_manifest.cmake:
  Bug#24732 Executables do not include Vista manifests
  - Define new CMake MACRO for adding Windows manifests to executables.
 2007-04-23 15:41:24 -04:00
unknown
d3fac6d2c2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  recycle.(none):/src/bug25621/my51-bug25621


sql/mysqld.cc:
  Auto merged
 2007-04-23 14:37:32 -04:00
unknown
0b07ccbe85 Merge recycle.(none):/src/bug25621/my50-bug25621 
into  recycle.(none):/src/bug25621/my51-bug25621


sql/mysqld.cc:
  Auto merged
 2007-04-23 14:34:10 -04:00
unknown
800d74f208 Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit 
- On Windows, connection handlers while exiting properly did not 
decrement the server's thread count.


sql/mysqld.cc:
  Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit
  - Make sure that connection handlers decrement number of threads
  and handlers on Windows.
  - Signal condition variable before unlocking mutex.
 2007-04-23 14:28:33 -04:00
unknown
6b573ac562 Bug#25141 Crash Server on Partitioning command 
- The function build_table_filename() builds up a string unconditionally 
using the forward slash as a path separator. Later, when the string is 
searched for FN_LIBCHAR by the set_up_table_before_create() function, a 
null pointer is returned that is finally used by strlen in the 
append_file_to_dir() function which causes the crash.


mysql-test/r/partition.result:
  Bug#25141 Crash Server on Partitioning command
  - Updated results
mysql-test/t/partition.test:
  Bug#25141 Crash Server on Partitioning command
  - Enable test on Windows.
  - Move failing Windows tests to partition_not_winodws test
sql/sql_table.cc:
  Bug#25141 Crash Server on Partitioning command
  - Use OS specific path separator when building table_filename
mysql-test/r/partition_not_windows.result:
  Bug#25141 Crash Server on Partitioning command
  - Non-Windows results.
mysql-test/r/partition_windows.result:
  Bug#25141 Crash Server on Partitioning command
  - Windows specific tests
mysql-test/t/partition_not_windows.test:
  Bug#25141 Crash Server on Partitioning command
  - Non-Windows specific partition tests
mysql-test/t/partition_windows.test:
  Bug#25141 Crash Server on Partitioning command
  - Windows specific partition tests.
 2007-04-23 13:50:34 -04:00
unknown
0d5a18b53b Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
client/mysqltest.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
 2007-04-23 17:01:02 +02:00
unknown
e4a8fd700e Only list "scripts" once in SUBDIRS 2007-04-23 16:39:22 +02:00
unknown
08e678c686 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


scripts/Makefile.am:
  Auto merged
 2007-04-23 14:02:09 +02:00
unknown
b44eee2a67 Add "name of struct" as first arg to comp_sql 
Fix "make distcheck"


scripts/CMakeLists.txt:
  Add "name of struct" as first arg to comp_sql
scripts/comp_sql.c:
  Add "name of struct" as first arg to comp_sql
 2007-04-23 14:01:48 +02:00
unknown
6e5abcaf03 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


Makefile.am:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
 2007-04-23 13:28:09 +02:00
unknown
09e6e6618f Use a temp variable "error" for storing return code of pclose 
so the WEXITSTATUS macro can "fiddle" with it as it so pleases
 2007-04-23 13:27:55 +02:00
unknown
f1e81f6c8d It's not possible to use the return value of fputs 
to check if the creation of mysql_upgrade_info suceeded.
Instead use 'upgrade_already_done' to check that file was
created properly.
 2007-04-23 13:07:49 +02:00
unknown
77d0d996be Update test to work also when --pager does not exist in "mysql" 2007-04-23 12:58:35 +02:00
unknown
b3e3c3881e Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


Makefile.am:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
 2007-04-23 12:05:00 +02:00
unknown
6a05f2af3c Fix warnings reported by icc 2007-04-23 12:02:58 +02:00
unknown
166af98f44 Remove left over file abi_check 
BitKeeper/deleted/.del-abi_check:
  Delete: include/abi_check
 2007-04-23 11:46:47 +02:00
unknown
18ea538648 Remove left over file fix_priv_tabs.result 
BitKeeper/deleted/.del-fix_priv_tabs.result:
  Delete: mysql-test/r/fix_priv_tabs.result
 2007-04-23 11:41:55 +02:00
unknown
984d8e23d6 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_process.pl:
  Auto merged
 2007-04-23 11:03:40 +02:00
unknown
d19d4b3f4f Protect against killing pid's that would "killall" or "kill self" 2007-04-23 11:01:22 +02:00
unknown
2c4ad7372c Merge bk-internal:/home/bk/mysql-5.1 
into  blade09.mysql.com:/tmp/mmj/mysql-5.1-runtime
 2007-04-21 18:35:01 +02:00
unknown
453ab04b6d test fixed for embedded server 
mysql-test/t/sp_trans_log.test:
  test disabled in embedded server
 2007-04-21 13:26:44 +05:00
unknown
2cba265144 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


sql/item_cmpfunc.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
 2007-04-21 13:20:13 +05:00
unknown
4272dbeda6 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


sql/item_cmpfunc.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
 2007-04-21 03:51:51 +02:00
unknown
f335e7e4bb Post-merge fix. 2007-04-20 17:47:14 -07:00
unknown
b634b55ecb manual merge 2007-04-20 17:49:07 -06:00
unknown
361649b906 Made changes to debian control files to support building 5.1 packages. 
debian/rules:
  --with-yassl is deprecated. Changed to --with-ssl
debian/libmysqlclientSLIB-dev.files.in:
  Removing mention of files no longer in 5.1
debian/mysql-client-BASE.files.in:
  Removing mention of files no longer in 5.1
debian/mysql-test-BASE.files.in:
  Removing mention of files no longer in 5.1
debian/mysql-server-BASE.files.in:
  Removing mention of files no longer in 5.1
 2007-04-20 16:15:30 -07:00
unknown
8a702a1e7b Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt


sql/item_cmpfunc.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
 2007-04-21 00:36:21 +02:00
unknown
6797b96ddf Branched for 5.1 2007-04-20 14:49:47 -07:00
unknown
e3ccf3c663 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge


client/mysqldump.c:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/event_data_objects.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
 2007-04-20 15:31:41 -06:00
unknown
82f6342695 Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint 
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-debian
 2007-04-20 14:16:33 -07:00
unknown
b873193ab6 Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-debian
 2007-04-20 14:09:43 -07:00
unknown
2173f6d76f Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-debian 
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-debian
 2007-04-20 13:54:32 -07:00
unknown
efe42b3857 Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt


mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/row.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/subselect3.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
mysql-test/t/view.test:
  Manually merged
sql/sql_lex.h:
  Manually merged
 2007-04-21 00:33:56 +04:00
unknown
f6409de79a Don't copy subidrs of scripts/ 2007-04-20 20:46:55 +02:00
unknown
4868ef1d80 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-04-20 13:57:24 -04:00
unknown
d8262276e1 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint


mysys/my_thr_init.c:
  Auto merged
 2007-04-20 13:52:57 -04:00
unknown
1c04850b95 Avoid compiler warnings. 2007-04-20 13:49:06 -04:00
unknown
51e016f184 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1


BitKeeper/deleted/.del-rpl_critical_errors.result:
  Delete: mysql-test/r/rpl_critical_errors.result
 2007-04-20 19:34:49 +02:00
unknown
4d0fad47ad Merge maint1.mysql.com:/data/localhome/msvensson/mysql-5.0-maint 
into  maint1.mysql.com:/data/localhome/msvensson/mysql-5.1-maint


BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged
 2007-04-20 15:36:56 +02:00
unknown
daca517b5e Protect against copying a ny subdirectories in scripts/ 2007-04-20 15:36:04 +02:00
unknown
4a3027aaa2 Added missing result file for rpl_critical_errors. 
mysql-test/r/rpl_critical_errors.result:
  New BitKeeper file ``mysql-test/r/rpl_critical_errors.result''
 2007-04-20 14:08:12 +02:00