diff options
| author | unknown <evgen@moonbone.local> | 2006-08-02 16:48:17 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-08-02 16:48:17 +0400 |
| commit | a5812433838540b600aac4689c3a44b44ab9d0be (patch) | |
| tree | 7a13fff7f71bd94f29b3db3ab423eb04d12f5bc8 /mysql-test/r/ps_1general.result | |
| parent | 0825bad93aaeaa64a907250263146adef8187405 (diff) | |
| parent | 504e3756561c92cacb85bf40d42079dcc8eda3d2 (diff) | |
| download | mariadb-git-a5812433838540b600aac4689c3a44b44ab9d0be.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
Diffstat (limited to 'mysql-test/r/ps_1general.result')
| -rw-r--r-- | mysql-test/r/ps_1general.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result index 3c736a508d3..ac8ae6def9f 100644 --- a/mysql-test/r/ps_1general.result +++ b/mysql-test/r/ps_1general.result @@ -298,7 +298,7 @@ t9 MyISAM 10 Dynamic 2 216 432 # 2048 0 NULL # # # latin1_swedish_ci NULL prepare stmt4 from ' show status like ''Threads_running'' '; execute stmt4; Variable_name Value -Threads_running 1 +Threads_running # prepare stmt4 from ' show variables like ''sql_mode'' '; execute stmt4; Variable_name Value |