mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
49152 commits 2793 branches 343 tags 1.7 GiB
Commit graph

49152 commits

This branch
This branch
All branches
Author SHA1 Message Date
joerg@trift2.
1d3f1985e4 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-15 12:52:47 +02:00
gshchepa/uchum@gleb.loc
9308d43490 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-14 15:39:57 +05:00
gshchepa/uchum@gleb.loc
67c586ff5c Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-14 13:45:49 +05:00
gshchepa/uchum@gleb.loc
c40fe57fb5 Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-14 13:44:15 +05:00
istruewing@synthia.local
50e3da81c2 Merge synthia.local:/home/mydev/mysql-5.0-axmrg 
into  synthia.local:/home/mydev/mysql-5.1-axmrg
 2007-08-13 23:49:07 +02:00
istruewing@synthia.local
6d67419fb6 Merge synthia.local:/home/mydev/mysql-5.1-amain 
into  synthia.local:/home/mydev/mysql-5.1-axmrg
 2007-08-13 23:46:25 +02:00
istruewing@synthia.local
6c95ced6c1 Merge synthia.local:/home/mydev/mysql-4.1-axmrg 
into  synthia.local:/home/mydev/mysql-5.0-axmrg
 2007-08-13 22:00:30 +02:00
istruewing@synthia.local
f0c883f3fb Merge synthia.local:/home/mydev/mysql-5.0-amain 
into  synthia.local:/home/mydev/mysql-5.0-axmrg
 2007-08-13 20:45:36 +02:00
istruewing@synthia.local
45647d3bd9 Merge synthia.local:/home/mydev/mysql-4.1-amain 
into  synthia.local:/home/mydev/mysql-4.1-axmrg
 2007-08-13 19:22:35 +02:00
gshchepa/uchum@gleb.loc
3368d2fb6b Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-11 03:37:43 +05:00
gshchepa/uchum@gleb.loc
db6ec3f71f Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-11 02:00:51 +05:00
gshchepa/uchum@gleb.loc
c04f57ccef Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-11 01:32:04 +05:00
gshchepa/uchum@gleb.loc
1b70ffee32 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-11 01:27:06 +05:00
omer@linux.site
6e06cb855f Updated to result files for cluster tests for version 5.1.21 
Updared to 'views' test - forcing sort order
Updateds included masked results as a result of bug 30322
 2007-08-08 17:16:26 -07:00
joerg@trift2.
3340659c21 Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-08 16:34:43 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
283e9529fc BUG#30274 (Debug server crashes because mutex isn't initialized): 
Completion patch, since it is possible that Log_event::write_header()
is called with no current thread.

When starting the server, there is no thread available, but
MYSQL_BIN_LOG::open() is called to initialize the binary log. The
function writes a format description log event to the binary log,
which means that Log_event::write_header() can be called with no
current thread object available.
 2007-08-08 16:50:43 +03:00
kostja@bodhi.(none)
3ecef8c0b9 A fix for Bug#28830 Test case log_state fails on VMWare Windows clone due to loaded system 2007-08-08 15:49:19 +04:00
kostja@bodhi.(none)
a3b210d408 Apply patch for Bug#27806 table comments not passed in to storage engine 
during "CREATE ... LIKE ..."
Only affects engine writers.
No change in server behaviour.
 2007-08-08 14:02:07 +04:00
kostja@bodhi.(none)
b4eb961fef Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-08-08 11:45:13 +04:00
kostja@bodhi.(none)
28f1f1828d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-08-08 11:36:55 +04:00
kostja@bodhi.(none)
3c6eb0002d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-08-08 11:34:35 +04:00
joerg@trift2.
b8eadebf4f Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-07 23:00:34 +02:00
joerg@trift2.
55d3781dfe Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-07 22:57:45 +02:00
joerg@trift2.
c664a34098 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-07 22:54:09 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
c8dc63b363 Removed wrong call to my_time(), before my_init() has been called. 2007-08-07 23:20:21 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
23fd74961d Removed a wrong call to my_time() before my_init() has been called. 
Fix for Bug#30274 "Debug server crashes because mutex isn't initialized"
 2007-08-07 22:54:42 +03:00
joerg@trift2.
70d937ace4 Merge trift2.:/MySQL/M51/push-5.1 
into  trift2.:/MySQL/M51/clone-5.1
 2007-08-07 15:21:32 +02:00
omer@linux.site
36ff199535 Updated funcs_1 test and result files (not including cluster) for 5.1.21 2007-08-06 18:46:00 -07:00
kent@mysql.com/kent-amd64.(none)
413d1e1aa4 CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js: 
Additional changes for bug#29903
  - Changed to do embedded build part as normal build, when
    WITH_EMBEDDED_SERVER is set.
  - Allow both normal and debug build with embedded.
  - Build static embedded library by pointing out all source and compile
    it all, i.e. not building libraries from libraries, not portable.
  - Let embedded use generated files from the "sql" directory, added
    dependencies to make sure built before embedded.
  - Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only
    linked in when debug target is used.
  - Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as
    others can't depend on it, not defined at configure time. Instead
    set the output file name.
  - Created work around for bug in CMake 2.4.6 and output names, to
    set the "mysqld<suffix>.pdb" name to the same base name.
  - Set the correct manifest "name" (patch by iggy)
 2007-08-06 23:16:01 +02:00
kostja@bodhi.(none)
256450d881 Fix one more warning. 2007-08-06 23:43:53 +04:00
jbruehe/mysqldev@mysql.com/production.mysql.com
0afb19f555 Raise version number after cloning 5.1.21-beta 2007-08-06 21:11:09 +02:00
kostja@bodhi.(none)
4cc808b7cf Fix "db_cl_altered might be used uninitialized" warning. 2007-08-06 22:52:50 +04:00
kostja@bodhi.(none)
057ab256cc Fix warnings. 2007-08-06 22:49:47 +04:00
kostja@bodhi.(none)
0c4d8e0032 Fix failing ddl_i18n* tests in the team tree. 2007-08-06 22:42:13 +04:00
gkodinov/kgeorge@magare.gmz
0ac8d08959 Bug 29536 : error message changed 5.0-opt -> 5.1-opt 2007-08-06 06:55:50 -07:00
gkodinov/kgeorge@magare.gmz
5068ebc1c5 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B29536-5.0-opt
 2007-08-06 06:37:05 -07:00
gkodinov/kgeorge@magare.gmz
5af5954ab5 Merge magare.gmz:/home/kgeorge/mysql/work/B29536-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B29536-5.1-opt
 2007-08-06 06:34:21 -07:00
gkodinov/kgeorge@magare.gmz
117c3ff9d7 Bug #29536: timestamp inconsistent in replication around 1970 
MySQL replicates the time zone only when operations that involve
it are performed. This is controlled by a flag. But this flag
is set only on successful operation.
The flag must be set also when there is an error that involves
a timezone (so the master would replicate the error to the slaves). 

Fixed by moving the setting of the flag before the operation
(so it apples to errors as well).
 2007-08-06 04:57:28 -07:00
kostja@bodhi.(none)
f4cfa793e5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-08-06 14:29:56 +04:00
kostja@bodhi.(none)
ec5464d2e0 A fix and a test case for Bug#29306 "Truncated data in MS Access with decimal (3,1) columns in a 
VIEW".

mysql_list_fields() C API function would incorrectly set MYSQL_FIELD::decimals
member for some view columns.

The problem was in an incomplete implementation of 
Item_ident_for_show::make_field(), which is responsible for view
columns metadata.
 2007-08-06 14:22:24 +04:00
igor@olga.mysql.com
46c29c8797 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-08-06 01:08:28 -07:00
igor@olga.mysql.com
b8e85da37b Removed a query from the test case for bug 39219 that displayed in valgrind 
a problem for BIT type values different from the one reported for the bug.
 2007-08-06 01:01:22 -07:00
igor@olga.mysql.com
9037f6d9b5 Post-merge fixes. 2007-08-06 00:53:32 -07:00
kent@kent-amd64.(none)
add9cb76b5 Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new 
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
 2007-08-06 08:33:20 +02:00
kent@mysql.com/kent-amd64.(none)
d75c7a58c1 make_win_bin_dist: 
Corrected install path
 2007-08-06 08:31:09 +02:00
kent@mysql.com/kent-amd64.(none)
f9fdd5ae8c make_win_bin_dist: 
Copy embedded .pdb and static debug lib
 2007-08-06 08:28:16 +02:00
igor@olga.mysql.com
676c5ef471 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug30219
 2007-08-05 18:39:12 -07:00
igor@olga.mysql.com
88703939ad Fixed compiler error for Windows in the patch for bug 30219. 2007-08-05 17:12:57 -07:00
kent@kent-amd64.(none)
0065e85e32 Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new 
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
 2007-08-06 01:35:43 +02:00
kent@mysql.com/kent-amd64.(none)
6ab4112c37 mysql-test-run.pl: 
Search "relwithdebinfo" directory in CMake Visual Studio build
  Search for "mysqld-debug" even in source tree
 2007-08-06 01:29:53 +02:00