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

49558 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
5a1db3a9ad Merge pilot.mysql.com:/data/msvensson/mysql/bug31167/my50-bug31167 
into  pilot.mysql.com:/data/msvensson/mysql/bug31167/my51-bug31167


scripts/mysql_system_tables_data.sql:
  Merge 5.0->5.1
 2007-10-03 11:19:24 +02:00
unknown
f700bf2d0d Bug#31167 Introduction of @@hostname breaks replication in a ring 
- Use a local uservariable to avoid @@hostname in binlog


scripts/mysql_system_tables_data.sql:
  Load @@hostname into a local user variable to avoid
  writing @@hostname to the binary log that potentially
  would be replicated to a slave server that not yet was upgraded
  to have @@hostname.
 2007-09-26 17:04:41 +02:00
unknown
ecee2de17f Add support for specifying suites not located in mysql-test/suite/ 
Example otions that will all run binlog_stm_binlog.test in suite/binlog:
 --suite=binlog binlog.binlog_stm_binlog
 --suite=binlog binlog_stm_binlog
 binlog_stm_binlog
 --suite=suite/binlog binlog.binlog_stm_binlog
 --suite=suite/binlog binlog_stm_binlog
 2007-09-11 15:00:52 +02:00
unknown
943ed8fe35 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-09-01 11:43:44 +02:00
unknown
8ffb011bb7 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_misc.pl:
  Auto merged
 2007-09-01 11:42:43 +02:00
unknown
5ece0c9b44 Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_misc.pl:
  Auto merged
 2007-09-01 11:41:59 +02:00
unknown
55566a66bd Use eval around "rmtree" and use our own version of rmtree if it fails 2007-09-01 11:41:38 +02:00
unknown
436cca531c Correct fix for test result. 2007-08-31 10:53:51 -06:00
unknown
c11de56813 Correct test result file for bug #27014 2007-08-31 05:21:12 -06:00
unknown
871172dd87 Fix test results for bug #27014 2007-08-31 01:28:42 -06:00
unknown
333a28bc76 Bug #27014: Imperfect error/warning message for STR_TO_DATE for invalid datetime value 
Fix name of function in warning message.


sql/item_timefunc.cc:
  Fix error message in extract_date_time(); ("str_to_time" -> "str_to_date")
 2007-08-30 23:57:39 -06:00
unknown
66baabd408 Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-30 14:56:24 -06:00
unknown
cebc1abcc3 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-30 14:54:19 -06:00
unknown
7de80833d9 Disable rpl_ndb_2other, which has never worked on bigendian machines. 2007-08-30 14:13:05 -06:00
unknown
ad49aa0649 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-30 07:25:18 +02:00
unknown
c8648fa38f Post-merge fixes, and disable buggy test case on embedded 
mysql-test/t/query_cache.test:
  Disable query_cache test on embedded, due to bug 30710.
sql/log_event_old.cc:
  Post-merge fix, change RELAY_LOG_INFO to Relay_log_info.
 2007-08-29 16:58:00 -06:00
unknown
674f49f8f4 Added ORDER BY to udf select so that results are ordered. 
mysql-test/include/rpl_udf.inc:
  ORDER BY to force order
mysql-test/suite/rpl/r/rpl_udf.result:
  Fix for ORDER BY
 2007-08-29 14:36:08 -07:00
unknown
48193af489 Merge sita.local:/Users/tsmith/m/bk/maint/51-target22 
into  sita.local:/Users/tsmith/m/bk/maint/51


sql/field.cc:
  Auto merged
sql/log_event_old.cc:
  Auto merged
sql/rpl_record.h:
  Auto merged
sql/rpl_utility.cc:
  Auto merged
sql/rpl_utility.h:
  Auto merged
sql/slave.h:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
sql/log_event.cc:
  Manual merge
sql/log_event.h:
  Manual merge
sql/log_event_old.h:
  Manual merge
sql/rpl_record.cc:
  Manual merge
sql/slave.cc:
  Manual merge
 2007-08-29 15:28:38 -06:00
unknown
053c9d1c47 Fix pushbuild test failures which occur on big-endian systems. 
Do not convert innodb autoincrement value to little endian when on
  big endian systems.


storage/innobase/row/row0sel.c:
  Do not convert innodb autoincrement value to little endian when on
  big endian systems.
 2007-08-29 13:02:02 -07:00
unknown
02ac63c18f Merge pilot.(none):/data/msvensson/mysql/my51-m-imsuite 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-29 19:08:35 +02:00
unknown
b201a6c7ac Move instance manager tests to it's own suite 
mysql-test/suite/im/t/im_daemon_life_cycle-im.opt:
  Rename: mysql-test/t/im_daemon_life_cycle-im.opt -> mysql-test/suite/im/t/im_daemon_life_cycle-im.opt
mysql-test/suite/im/t/im_instance_conf-im.opt:
  Rename: mysql-test/t/im_instance_conf-im.opt -> mysql-test/suite/im/t/im_instance_conf-im.opt
mysql-test/suite/im/t/im_life_cycle-im.opt:
  Rename: mysql-test/t/im_life_cycle-im.opt -> mysql-test/suite/im/t/im_life_cycle-im.opt
mysql-test/suite/im/t/im_options-im.opt:
  Rename: mysql-test/t/im_options-im.opt -> mysql-test/suite/im/t/im_options-im.opt
mysql-test/suite/im/t/im_utils-im.opt:
  Rename: mysql-test/t/im_utils-im.opt -> mysql-test/suite/im/t/im_utils-im.opt
mysql-test/suite/im/r/im_cmd_line.result:
  Rename: mysql-test/r/im_cmd_line.result -> mysql-test/suite/im/r/im_cmd_line.result
mysql-test/suite/im/r/im_daemon_life_cycle.result:
  Rename: mysql-test/r/im_daemon_life_cycle.result -> mysql-test/suite/im/r/im_daemon_life_cycle.result
mysql-test/suite/im/r/im_instance_conf.result:
  Rename: mysql-test/r/im_instance_conf.result -> mysql-test/suite/im/r/im_instance_conf.result
mysql-test/suite/im/r/im_life_cycle.result:
  Rename: mysql-test/r/im_life_cycle.result -> mysql-test/suite/im/r/im_life_cycle.result
mysql-test/suite/im/r/im_options.result:
  Rename: mysql-test/r/im_options.result -> mysql-test/suite/im/r/im_options.result
mysql-test/suite/im/r/im_utils.result:
  Rename: mysql-test/r/im_utils.result -> mysql-test/suite/im/r/im_utils.result
mysql-test/suite/im/t/utils.sh:
  Rename: mysql-test/t/utils.sh -> mysql-test/suite/im/t/utils.sh
mysql-test/suite/im/t/wait_for_process.sh:
  Rename: mysql-test/t/wait_for_process.sh -> mysql-test/suite/im/t/wait_for_process.sh
mysql-test/suite/im/t/wait_for_socket.sh:
  Rename: mysql-test/t/wait_for_socket.sh -> mysql-test/suite/im/t/wait_for_socket.sh
mysql-test/suite/im/t/log.sh:
  Rename: mysql-test/t/log.sh -> mysql-test/suite/im/t/log.sh
mysql-test/suite/im/t/kill_n_check.sh:
  Rename: mysql-test/t/kill_n_check.sh -> mysql-test/suite/im/t/kill_n_check.sh
mysql-test/suite/im/t/im_check_env.inc:
  Rename: mysql-test/include/im_check_env.inc -> mysql-test/suite/im/t/im_check_env.inc
mysql-test/suite/im/t/im_cmd_line.imtest:
  Update location of im_check_env.inc
mysql-test/suite/im/t/im_daemon_life_cycle.imtest:
  Update location of im_check_env.inc
  Add variable UTIL that points to the "ugly" .sh scripts
mysql-test/suite/im/t/im_instance_conf.imtest:
  Update location of im_check_env.inc
mysql-test/suite/im/t/im_life_cycle.imtest:
  Update location of im_check_env.inc
  Add variable UTIL that points to the "ugly" .sh scripts
mysql-test/suite/im/t/im_options.imtest:
  Update location of im_check_env.inc
mysql-test/suite/im/t/im_utils.imtest:
  Update location of im_check_env.inc
  Add variable UTIL that points to the "ugly" .sh scripts
mysql-test/t/disabled.def:
  Move disabled im test to suite/im/t/disabled.def
mysql-test/suite/im/t/disabled.def:
  New BitKeeper file ``mysql-test/suite/im/t/disabled.def''
 2007-08-29 19:02:33 +02:00
unknown
59f0a43259 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2007-08-29 17:54:40 +02:00
unknown
7cafddc345 Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2007-08-29 17:54:16 +02:00
unknown
10012b36fe Remove any old pidfile before starting mysqld to make sure that 
'mysqld_wait_started' don't return prematurely because of an old
pidfile
 2007-08-29 17:54:02 +02:00
unknown
3e82da7a72 Merge kindahl-laptop.dnsalias.net:/home/bk/b29968-merge-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/merge-5.1-target-5.1.22
 2007-08-29 16:12:54 +02:00
unknown
e5c8240a7a BUG#29968 (rpl_ndb_circular.test and rpl_ndb_log.test fail): 
Removing unguarded read of slave_running field from inside
terminate_slave_threads(). This could cause premature exit in the event
that the slave thread already were shutting down, but isn't finished yet.

The fields slave_running, io_thd, and sql_thread are guarded by an
associated run_lock. A read of these fields were not guarded inside
terminate_slave_threads(), which caused an assertion to fire. The
assertion was removed, and the code reorganized slightly.


sql/slave.cc:
  Changing signature of terminate_slave_thread() to accept a skip_lock
  parameter instead of two mutexes. This mimics the signature of the
  terminate_slave_threads() function. Code is also changed as a result
  of this.
  
  Removing unguarded check of slave_running field in the master info and
  relay log info structure since that could cause premature exit of
  terminate_slave_threads().
  
  The thread variable for each of the slave threads can change before
  acquiring the run_lock mutex inside terminate_slave_thread(). Hence
  an assertion was removed that read the variable without guarding it
  with run_lock.
  
  Code that checked *slave_running status inside terminate_slave_thread()
  was reorganized slightly.
sql/slave.h:
  Moving terminate_slave_thread() to use internal linkage.
 2007-08-29 16:06:59 +02:00
unknown
4b0d90189a Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/myisam.test:
  Use local
 2007-08-29 14:46:33 +02:00
unknown
2e4963c5b6 Remove unportable use of "system rm" 2007-08-29 14:44:23 +02:00
unknown
f1f39d5d07 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_misc.pl:
  Auto merged
 2007-08-29 14:40:38 +02:00
unknown
5819322bd9 Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_misc.pl:
  Auto merged
 2007-08-29 14:39:59 +02:00
unknown
305c352685 Fix typo: '$$' => '$' 2007-08-29 14:39:40 +02:00
unknown
024bd2f612 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/backup.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
 2007-08-29 12:47:28 +02:00
unknown
cf37bc45fc Remove unportable use of "system rm" 2007-08-29 12:47:00 +02:00
unknown
643b2163e6 Remove unportable "system rm" 2007-08-29 12:44:43 +02:00
unknown
6d0cc3ca7c Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
 2007-08-29 11:55:03 +02:00
unknown
ec63a85890 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-29 11:54:26 +02:00
unknown
3b7f80940d Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-29 11:54:21 +02:00
unknown
ff2475635c Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
 2007-08-29 11:53:36 +02:00
unknown
2675c95217 Remove unportable use of "exec chmod" 2007-08-29 11:53:15 +02:00
unknown
038df2d05c Add 'mtr_rmtree' 
mysql-test/lib/mtr_misc.pl:
  Add function 'mtr_rmtree' it will try 'rmtree' and if that fails (most likely
  due to permission problems we will fun File::find to chmod all files and dirs
  to 0777 and then delete.
mysql-test/mysql-test-run.pl:
  Use 'mtr_rmtree' in favour of 'rmtree'
 2007-08-29 11:51:34 +02:00
unknown
b288c7d9da Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
 2007-08-29 09:50:20 +02:00
unknown
d27ec7a5e7 Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue 
- reverting patch as there where unknows sideeffects that we do not have time to follow up on just now
 2007-08-29 09:44:37 +02:00
unknown
56e6e9c1c2 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-28 13:25:06 -06:00
unknown
4dac538a0b Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/b27694/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-28 13:24:31 -06:00
unknown
41d3336319 Fix another compiler warning on Windows in InnoDB. 
storage/innobase/handler/ha_innodb.cc:
  Fix compiler warning: ::get_auto_increment takes a ulonglong
  for nb_desired_values, but InnoDB's trx struct stores it as
  a ulint (unsigned long).  Probably harmless, as a single
  statement won't be asking for more than 2^32 rows.
 2007-08-28 10:17:15 -06:00
unknown
0ee9467b27 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Merge 5.0->5.1
 2007-08-28 16:47:41 +02:00
unknown
2bb6a44af1 Streamline "do_close_connection" and "do_send_quit" 
Fix typo, "next_con" -> "con"


client/mysqltest.c:
  Reuse "find_connection_by_name" both from "do_close_connection" and "do_send_quit"
  Adjust alignment of comment
  Fix typo in "do_close_connection", it used the global variable "next_con" instead
  of local variable "con"
 2007-08-28 16:47:05 +02:00
unknown
f386e29534 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/loaddata.test:
  Auto merged
 2007-08-28 16:44:51 +02:00
unknown
5f524dadcd Remove unportable constructs in loaddata.test 2007-08-28 16:44:31 +02:00
unknown
9e70dba8e9 Remove unportable construct in loaddata.test 2007-08-28 15:35:42 +02:00