mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-25 00:04:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
44034 commits 2774 branches 343 tags 1.6 GiB
Commit graph

840 commits

Author SHA1 Message Date
msvensson@pilot.blaudden
dd16b217c7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-08 14:56:08 +01:00
msvensson@pilot.blaudden
433d3e6cf7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-08 14:55:39 +01:00
tsmith@quadxeon.mysql.com
79191807ff Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51
 2007-03-07 07:21:24 +01:00
tsmith@quadxeon.mysql.com
a15fe85de2 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50
 2007-03-07 06:54:35 +01:00
msvensson@pilot.blaudden
94c616d186 Bug #26792 Add DBX debugger support to mysql-test-run.pl 
- Add --debugger=dbx
 - Fix --debugger=devenv, --debugger=DevEnv and --debugger=/path/devenv
 2007-03-05 09:52:40 +01:00
malff/marcsql@weblab.(none)
df5c5aea23 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
 2007-03-01 14:06:57 -07:00
msvensson@pilot.blaudden
d1d64ba50f Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-01 19:10:07 +01:00
msvensson@pilot.blaudden
86625d711f Fix bug in mtr.pl where slave wes using same query log file as master 2007-03-01 18:31:09 +01:00
msvensson@pilot.blaudden
f5778fc73e Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-01 18:12:56 +01:00
msvensson@pilot.blaudden
51a71fb667 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-01 14:53:32 +01:00
malff/marcsql@weblab.(none)
dc98aa82ab Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
 2007-02-28 18:14:56 -07:00
msvensson@pilot.blaudden
162f0803bb Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 16:40:50 +01:00
msvensson@pilot.blaudden
05ed84a3d2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
 2007-02-28 15:04:20 +01:00
msvensson@pilot.blaudden
9cfd569174 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-28 14:41:57 +01:00
msvensson@pilot.blaudden
e391b86fb0 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Split out initial data in mysql_system_tables.sql to  it's own file
 - Use file from mysql_install_db and mysql-test-run
 2007-02-28 14:26:58 +01:00
msvensson@pilot.blaudden
f63240f901 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 13:48:43 +01:00
msvensson@pilot.blaudden
6ea41f355c Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-28 13:47:59 +01:00
msvensson@pilot.blaudden
c0da93cd97 When using a --mem=<dir> the memdir must be removed to assure 
afresh start
 2007-02-28 13:47:41 +01:00
msvensson@pilot.blaudden
780d434cb5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 10:07:37 +01:00
monty@mysql.com/narttu.mysql.fi
cfef5d04b3 Remove compiler warnings 2007-02-27 19:31:49 +02:00
msvensson@pilot.blaudden
2f36118018 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-27 15:29:44 +01:00
msvensson@pilot.blaudden
14cfc7e1ba Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-27 14:54:33 +01:00
msvensson@pilot.blaudden
eb135547eb Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-26 14:56:23 +01:00
msvensson@pilot.blaudden
23b6b4a565 Only allow a version number to be read from "/etc/debian_version" 2007-02-26 14:52:51 +01:00
msvensson@pilot.blaudden
f6e31a2cd1 Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
 2007-02-26 14:25:59 +01:00
msvensson@pilot.blaudden
c550a45522 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Use mysql_system_tables.sql to create MySQL system tables in
   all places where we create them(mysql_install_db, mysql-test-run-pl
   and mysql_fix_privilege_tables.sql)
 2007-02-26 11:49:24 +01:00
anozdrin/alik@booka.opbmk
77079d385d Fix shutdown delay option name according to The Manual. 2007-02-24 13:10:04 +03:00
anozdrin/alik@alik.opbmk
50e5958f28 Fix merge & update result file. 2007-02-23 23:36:25 +03:00
anozdrin/alik@alik.opbmk
fe585401ed Merge alik.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt-build 
into  alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-build
 2007-02-23 21:55:14 +03:00
anozdrin/alik@alik.opbmk
90115eac42 Fix mysql-test-run.pl: IM in 5.0 uses old incorrect 
'shutdown_delay' option name.
 2007-02-23 21:51:33 +03:00
anozdrin/alik@alik.opbmk
13acde39ba Merge alik.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt 
into  alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt
 2007-02-23 20:27:13 +03:00
anozdrin/alik@alik.opbmk
8f5c21172c BUG#24415: im_daemon_life_cycle.imtest fails 
Fix timeouts. Only test suite is changed.
 2007-02-23 20:24:32 +03:00
monty@mysql.com/narttu.mysql.fi
f0ae3ce9b9 Fixed compiler warnings 
Fixed compile-pentium64 scripts
Fixed wrong estimate of update_with_key_prefix in sql-bench
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1
Fixed unsafe define of uint4korr()
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc
Split handle_one_connection() into reusable sub functions.
Split create_new_thread() into reusable sub functions.
Added thread_scheduler; Preliminary interface code for future thread_handling code.

Use 'my_thread_id' for internal thread id's
Make thr_alarm_kill() to depend on thread_id instead of thread
Make thr_abort_locks_for_thread() depend on thread_id instead of thread
In store_globals(), set my_thread_var->id to be thd->thread_id.
Use my_thread_var->id as basis for my_thread_name()
The above changes makes the connection we have between THD and threads more soft.

Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions
Fixed compiler warnings
Fixed core dumps when running with --debug
Removed setting of signal masks (was never used)
Made event code call pthread_exit() (portability fix)
Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called.
Made handling of thread_id and thd->variables.pseudo_thread_id uniform.
Removed one common 'not freed memory' warning from mysqltest
Fixed a couple of usage of not initialized warnings (unlikely cases)
Suppress compiler warnings from bdb and (for the moment) warnings from ndb
 2007-02-23 13:13:55 +02:00
monty@mysql.com/narttu.mysql.fi
26aa385bc5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2007-02-21 14:07:08 +02:00
monty@mysql.com/narttu.mysql.fi
222e128b34 Fixed unsafe define of uint4korr() 
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
 2007-02-21 13:02:57 +02:00
msvensson@pilot.blaudden
104995f2e7 Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
 2007-02-20 12:48:56 +01:00
msvensson@pilot.blaudden
bcd368fcfb Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Add test of bootstrap mode
 - Make mysqld return error if bootstrap failed
 2007-02-20 12:48:15 +01:00
msvensson@pilot.blaudden
10da8b7e96 Bug#25592 wrong reporting for mysql-test-run.pl --mysqld=--binlog-format=... 2007-02-19 12:59:19 +01:00
msvensson@pilot.blaudden
03b71c9209 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-16 15:32:51 +01:00
msvensson@pilot.blaudden
b57994a7c2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-16 15:23:27 +01:00
msvensson@neptunus.(none)
8931166e55 Workaround for problem where cygwin's bash/sh randomly fails with error 128 which 
mainly occurs on win2003 64bit.
 - Execute "exec" commands directly with cmd.exe and replace "--exec echo ..." with "--exec .\echo.exe ..."
 2007-02-16 15:19:38 +01:00
msvensson@pilot.mysql.com
b6f78aa153 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-14 14:51:49 +01:00
msvensson@pilot.mysql.com
24a242bee1 Merge pilot.mysql.com:/home/msvensson/mysql/bug18628/my50-bug18628 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-14 14:45:15 +01:00
msvensson@pilot.mysql.com
45fe5879f4 Bug#18628 mysql-test-run: security problem(part1) 
- Implement --secure-file-priv=<dir> option that limits
  "load_file", "LOAD DATA" and "SELECT .. INTO OUTFILE" to work 
  with files in specified dir.
 - Use above option for mysqld in mysql-test-run.pl
 2007-02-14 14:44:34 +01:00
msvensson@pilot.mysql.com
836f777b55 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-06 16:38:56 +01:00
msvensson@pilot.mysql.com
b6bd53aa9d Correct the non working check for --skip-log-bin in "extra_opt" 2007-02-06 16:38:32 +01:00
msvensson@pilot.mysql.com
61686e8556 Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-06 14:30:23 +01:00
msvensson@pilot.mysql.com
3a48e8ee27 Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805 
into  pilot.mysql.com:/home/msvensson/mysql/bug24805/my51-bug24805
 2007-02-06 14:22:48 +01:00
msvensson@pilot.mysql.com
958308a5cf Bug#24805 mtr.pl can't handle test with --disable-log-bin 
- Don't give mysqld the --log-bin argument if .opt file
  contains --skip-log-bin
- Enable flush2 test
 2007-02-06 14:19:07 +01:00
cmiller@zippy.cornsilk.net
a795b7097f Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2007-01-31 16:26:12 -05:00