mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45569 commits 2784 branches 343 tags 1.6 GiB
Commit graph

2514 commits

Author SHA1 Message Date
msvensson@pilot.blaudden
9c775302de Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-19 21:31:17 +02:00
msvensson@pilot.blaudden
da93a36a0e mysql_upgrade portability fixes 2007-04-19 21:30:46 +02:00
msvensson@pilot.blaudden
1f6021dd30 mysql_upgrade must depend on GenFixPrivs 2007-04-19 18:34:00 +02:00
msvensson@pilot.blaudden
2c95135c8d mysql_upgrade depends on GenFixPrivs 2007-04-19 18:32:55 +02:00
msvensson@pilot.blaudden
179ffb2407 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-19 17:05:18 +02:00
msvensson@pilot.blaudden
ce518d20ef Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-19 17:01:59 +02:00
msvensson@pilot.blaudden
41c41448b9 mysql_upgrade win fixes 2007-04-19 17:00:29 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
3a0042c757 Merge mysql.com:/home/ram/work/b26851/b26851.5.0 
into  mysql.com:/home/ram/work/b26851/b26851.5.1
 2007-04-19 11:07:19 +05:00
tsmith@siva.hindu.god
88a477abe9 Post-push fix of client/mysqltest.c oops. 2007-04-18 21:29:38 -06:00
tsmith@siva.hindu.god
041c8a825f Move WEXITSTATUS #define from mysqltest.c to client_priv.h, and 
include client_priv.h in mysqltest.c.  Portability fix.
 2007-04-18 20:47:55 -06:00
tsmith@siva.hindu.god
9232def96b Merge siva.hindu.god:/home/tsmith/m/bk/51 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-04-18 14:55:42 -06:00
msvensson@pilot.blaudden
91213f512c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 19:01:01 +02:00
msvensson@pilot.blaudden
4e84ab3f82 Remove the check for value_start(if any it should be *value_start) 2007-04-18 19:00:42 +02:00
msvensson@pilot.blaudden
eeaf1fa655 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 18:40:44 +02:00
msvensson@pilot.blaudden
453b6180d0 Use my_snprintf instead of snprintf 2007-04-18 18:40:22 +02:00
msvensson@pilot.blaudden
6e6d942cb4 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-18 18:38:20 +02:00
msvensson@pilot.blaudden
905996141d Use my_snprintf instead of snprintf 2007-04-18 18:38:03 +02:00
msvensson@pilot.blaudden
dc66c88bba Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 16:57:40 +02:00
msvensson@pilot.blaudden
a8a8c8c181 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-18 16:56:32 +02:00
msvensson@pilot.blaudden
e9a9107f4f Add mysql builtin $MYSQL_SERVER_VERSION and some function to make 
it easier to set a variable from string or int
 2007-04-18 16:56:17 +02:00
msvensson@pilot.blaudden
01133f8e6f Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 14:18:55 +02:00
msvensson@pilot.blaudden
dd0d2146c3 Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-18 13:22:32 +02:00
msvensson@pilot.blaudden
20e622dcf3 Bug#25452 mysql_upgrade access denied 
- Improve mysql_upgrade and add comments describing it's logic
 - Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade
  was started from
 - Don't look for mysql_fix_privilege_tables.sql randomly, compile
  in the mysql_fix_privilege_tables.sql file and use that to upgrade
  the system tables of MySQL
 - Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL
 - Fix bug#26639, bug#24248 and bug#25405
 2007-04-18 13:21:39 +02:00
monty@mysql.com/narttu.mysql.fi
0a35bd923f Fixed federated and some replication tests to not stop slave until it's up and running. 
(Removes some warnings about UNIX_TIMESTAMP from the slave.err logs)
Marked federated_server as a '--big-test'
Change error in net_clear to 'Note', as it interfered with mysql-test-run.
 2007-04-17 14:41:16 +03:00
monty@mysql.com/narttu.mysql.fi
72d135bec5 Clear field_alloc when it's moved to result set (allows us to always call free_root on field_alloc) 
Change to use remove_file instead of 'system rm' in a lot of tests. (Should fix some windows test problems)
Removed memory leak in mysql_test if sync_with_master fails.
Do not terminate ndb_cluster_binary_log before the util thread has finnished. This should fix a shutdown bug where a thread is accessing injector_mutex after it's freed.
Patch may fix Bug#27622 "mysqld shutdown, util thread continues, while binlog thread exits"
 2007-04-16 17:08:29 +03:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e62dbcf746 Fix for 
bug #27715: mysqld --character-sets-dir buffer overflow
bug ##26851: Mysql Client --pager Buffer Overflow

Using strmov() to copy an argument may cause overflow 
if the argument's length is bigger than the buffer:
use strmake instead.
Also, we have to encrease the error message buffer size to fit 
the longest message.
 2007-04-16 12:28:02 +05:00
jani@a88-113-38-195.elisa-laajakaista.fi
52196018ce Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.1-marvel
 2007-04-13 10:25:33 +03:00
jani@ua141d10.elisa.omakaista.fi
335153121b Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
 2007-04-12 12:50:02 +03:00
msvensson@pilot.blaudden
2218fafa1f Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-11 09:34:02 +02:00
msvensson@pilot.blaudden
19f379b807 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-10 17:17:53 +02:00
msvensson@pilot.blaudden
3d847358de Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-10 17:17:08 +02:00
msvensson@pilot.blaudden
9917d018a6 Take into account wether vertical_results are in effect 2007-04-10 17:09:35 +02:00
msvensson@pilot.blaudden
73c6cde9d4 Init dying to 1 just after passing the guard 2007-04-10 17:06:36 +02:00
msvensson@pilot.blaudden
da2a216895 Add OPT_LOG_DIR 2007-04-10 17:05:22 +02:00
jani@ua141d10.elisa.omakaista.fi
b4ba815967 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-04-10 16:28:47 +03:00
serg@janus.mylan
102f58fe34 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.0
 2007-04-10 15:27:26 +02:00
serg@janus.mylan
1c678b34aa Bug#27171 mysqlbinlog produces different output depends from option -R 
a better fix, that works with 4.1 servers which don't send a fake
Format_description_log_event.
 2007-04-10 15:26:35 +02:00
msvensson@pilot.blaudden
448a6778cb Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-10 14:59:46 +02:00
msvensson@pilot.blaudden
d4f01284bd Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-10 14:47:53 +02:00
msvensson@pilot.blaudden
829ca34daf Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-10 14:46:57 +02:00
msvensson@pilot.blaudden
5c5271754b Add --logdir option ot mysqltest 2007-04-10 14:45:13 +02:00
msvensson@pilot.blaudden
4496a8f546 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-10 14:31:33 +02:00
msvensson@pilot.blaudden
34a784f3d0 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-10 14:29:22 +02:00
msvensson@pilot.blaudden
60eb839e77 Merge 192.168.0.4:mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-04-10 13:51:32 +02:00
holyfoot/hf@hfmain.(none)
ce426dd622 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-07 14:59:53 +05:00
msvensson@shellback.(none)
2df8524391 Add "query_sorted" command to mysqltest 
Usage:
  query_sorted <query>;
 2007-04-05 20:12:56 +02:00
msvensson@pilot.blaudden
dec5334a2b Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-05 14:51:49 +02:00
msvensson@pilot.blaudden
c3dc142df5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-05 13:54:24 +02:00
msvensson@pilot.blaudden
9cd8b2b8fb Protect against dying twice 
Cleanup exit handling
 2007-04-05 13:53:44 +02:00
msvensson@pilot.blaudden
ff0ee38bd7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-04 15:43:03 +02:00