mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24872 commits 2781 branches 343 tags 1.6 GiB
Commit graph

24872 commits

This branch
This branch
All branches
Author SHA1 Message Date
bell@sanja.is.com.ua
0cd54564bf Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-trigger-5.0
 2005-07-28 22:39:59 +03:00
bell@sanja.is.com.ua
b220fc47ef store/restore sql_mode which was in force during ctrigger creation (BUG#5891) 
other sql_mode fixes
 2005-07-28 22:39:11 +03:00
lenz@mysql.com
bbd06a333a Merge mysql.com:/space/my/mysql-4.1-merge 
into mysql.com:/space/my/mysql-5.0-build
 2005-07-25 15:04:28 +02:00
lenz@mysql.com
0c30acae32 - merge from 4.0: updated scripts/Makefile.am to properly create but not install 
make_binary_distribution, make_sharedlib_distribution and make_win_src_distribution
- removed make_win_binary_distribution.sh
 2005-07-25 14:39:23 +02:00
lenz@mysql.com
d9bacfa236 - Make sure the scripts make_binary_distribution, make_sharedlib_distribution and 
make_win_src_distribution are created, but not installed
- removed make_win_binary_distribution.sh as it's obsolete and outdated
 2005-07-25 14:14:24 +02:00
georg@lmy002.wdf.sap.corp
35b66a40c2 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
 2005-07-24 08:12:20 +02:00
bell@sanja.is.com.ua
f5833989ba Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
 2005-07-23 07:55:07 +03:00
bell@sanja.is.com.ua
bfdb6ca3cf store SERVER_MORE_RESULTS_EXISTS in key of query cache (BUG#6897) 2005-07-23 07:51:25 +03:00
jimw@mysql.com
d6d1a9aae2 Merge mysql.com:/home/jimw/my/mysql-5.0-11227 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-22 12:39:47 -07:00
jimw@mysql.com
421f267b7f Merge mysql.com:/home/jimw/my/mysql-5.0-11213 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-22 12:38:14 -07:00
jimw@mysql.com
6e955625f6 Merge mysql.com:/home/jimw/my/mysql-5.0-build 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-22 12:36:17 -07:00
jimw@mysql.com
49e5636410 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-22 12:35:15 -07:00
jimw@mysql.com
e15dd02241 Remove use of non-portable gettimeofday() in thr_lock.c (Bug #12100) 2005-07-22 12:01:42 -07:00
jimw@mysql.com
535ba76b98 Merge mysql.com:/home/jimw/my/mysql-4.1-10407 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-22 11:57:34 -07:00
patg@radha.local
757f94009f removed DBUG code from ha_federated.cc causing windows compile problems. 
This is for the release bk tree, same change as 1.1890, which JimW approved.
 2005-07-22 20:56:08 +02:00
jimw@mysql.com
e26a344d19 Fix calculation for length of LPAD() and RPAD() reported to 
client via mysql_fetch_fields(). (Bug #11311)
 2005-07-22 11:46:29 -07:00
joerg@mysql.com
306ade1fd5 Add the definition of "floatget". 
Necessary to compile 5.0.10 on Windows, no bug report filed.
 2005-07-22 20:37:59 +02:00
paul@snake-hub.snake.net
368d353993 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2005-07-22 12:59:41 -05:00
paul@snake-hub.snake.net
3723ea1c67 errmsg.txt: 
Change an ` quote to ' (' is used everywhere else)
  This does not affect any test results.
 2005-07-22 12:46:39 -05:00
bar@mysql.com
daab2160a0 Merge mysql.com:/usr/home/bar/mysql-4.1.b11987 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-07-22 21:13:15 +05:00
bar@mysql.com
44a446dc07 ctype-gbk.c: 
Bug #11987
  mysql will truncate the text when the text contain GBK char:"0xA3A0" and "0xA1"
  Allow to store and retrieve even unassigned GBK codes.
  Like we did in Big5 earlier.
have_gbk.inc, have_gbk.require, ctype_gbk.result, ctype_gbk.test:
  new file
 2005-07-22 21:06:02 +05:00
joreland@mysql.com
4f7360f31d ndb - hugo, fix closeTransaction in testPartitioning 2005-07-22 16:29:38 +02:00
georg@lmy002.wdf.sap.corp
36b9af2d02 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
 2005-07-22 15:48:07 +02:00
joreland@mysql.com
21edad598d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/jonas/src/mysql-5.0
 2005-07-22 14:32:17 +02:00
joreland@mysql.com
4fedf8462d bug#11133 - ndb write/lock upgrade 
fix test case
  improve testing
 2005-07-22 14:30:00 +02:00
stewart@mysql.com
36b5406604 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/wl2347
 2005-07-22 21:43:25 +10:00
bar@mysql.com
cbbf0e21b3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-07-22 16:35:09 +05:00
stewart@mysql.com
6f62273c00 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/wl2347
 2005-07-22 21:22:40 +10:00
bar@mysql.com
a7e5fa4d83 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b11754
 2005-07-22 15:33:13 +05:00
stewart@mysql.com
96f8cf3588 WL#2347 - Load independent heartbeats 
Reset missed heartbeat count on receipt of signal from node.

This fixes a bug where that under high network load, the heartbeat packets could be
delayed, causing the appearance of node failure (due to lost heartbeats).
 2005-07-22 20:29:25 +10:00
joreland@mysql.com
f4731e1f40 Merge mysql.com:/home/jonas/src/mysql-5.0 
into  mysql.com:/home/jonas/src/mysql-5.0-push
 2005-07-22 12:28:17 +02:00
joreland@mysql.com
fc2573a086 bug#11675 - ndb backup 
Fix invalid backup log when using #nodes != 2^x
  Fix ndb_restore --printXXX options
    (among other init counters)
 2005-07-22 12:17:53 +02:00
stewart@mysql.com
6d8e118f3c Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  mysql.com:/home/stewart/Documents/MySQL/4.0/main
 2005-07-22 19:53:32 +10:00
stewart@mysql.com
614c6cd8ef Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
 2005-07-22 19:49:50 +10:00
bar@mysql.com
894dc2fdb0 Merge mysql.com:/usr/home/bar/mysql-4.1.b11754 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-07-22 14:47:13 +05:00
stewart@mysql.com
5ac22d0446 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2005-07-22 19:44:33 +10:00
bar@mysql.com
4d75b059c0 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b11754
 2005-07-22 13:27:30 +05:00
hf@deer.(none)
d72a837029 Merge deer.(none):/home/hf/work/mysql-4.1.clean 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-07-22 12:18:19 +05:00
hf@deer.(none)
62aad2bcd0 merging 2005-07-22 12:15:09 +05:00
hf@deer.(none)
5efe010f8a Merge bk@192.168.21.1:/usr/home/bk/mysql-4.0 
into deer.(none):/home/hf/work/mysql-4.0.clean
 2005-07-22 12:01:28 +05:00
georg@lmy002.wdf.sap.corp
59ddf61392 fix for bug#8692 2005-07-22 08:11:23 +02:00
jimw@mysql.com
6eae678f56 Fix error message generated when trying to create a table in a 
non-existent database. (Bug #10407)
 2005-07-21 20:08:54 -07:00
stewart@mysql.com
71215f68e5 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  mysql.com:/home/stewart/Documents/MySQL/4.0/main
 2005-07-22 12:52:06 +10:00
stewart@mysql.com
ef29f88c43 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2005-07-22 12:40:55 +10:00
patg@radha.local
86f9a08f36 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  radha.local:/Users/patg/mysql-build/mysql-5.0.msvensson
 2005-07-22 04:36:27 +02:00
patg@radha.local
8d671d7bca Applied and tested this patch successfully (bug 10431) to a clean 
tree on brian's amd 64 box (which was already approved). 

[patg@zim mysql-5.0]$ bk changes
ChangeSet@1.1882, 2005-07-21 18:43:55+05:00, gluh@eagle.intranet.mysql.r18.ru
  merge fix

Was the changeset level I applied this patch to.

Master shutdown finished
Slave shutdown finished
All 326 tests were successful.

[patg@zim mysql-5.0]$
 2005-07-22 04:11:45 +02:00
stewart@mysql.com
49c157d073 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
 2005-07-22 11:32:03 +10:00
petr@mysql.com
49a1156c52 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-07-21 22:59:32 +04:00
petr@mysql.com
2624bf5290 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-07-21 22:51:15 +04:00
petr@mysql.com
9644bc3e2b Post-review fixes for WL#2713 "Change IM behaviour so, that it only reads and alters one config file only." 2005-07-21 22:40:53 +04:00